border=True parameter for Canvas()

Author: Tom De Smedt

nodebox/graphics/context.py

@@ -3400,6 +3400,10 @@ def __repr__(self):
 
 FRAME = 0
 
+# Window styles.
+WINDOW_DEFAULT    = pyglet.window.Window.WINDOW_STYLE_DEFAULT
+WINDOW_BORDERLESS = pyglet.window.Window.WINDOW_STYLE_BORDERLESS
+
 # Configuration settings for the canvas.
 # http://www.pyglet.org/doc/programming_guide/opengl_configuration_options.html
 # The stencil buffer is enabled (we need it to do clipping masks).
@@ -3434,7 +3438,7 @@ def _configure(settings):
 
 class Canvas(list, Prototype, EventHandler):
 
-    def __init__(self, width=640, height=480, name="NodeBox for OpenGL", resizable=False, settings=OPTIMAL, vsync=True):
+    def __init__(self, width=640, height=480, name="NodeBox for OpenGL", resizable=False, border=True, settings=OPTIMAL, vsync=True):
         """ The main application window containing the drawing canvas.
             It is opened when Canvas.run() is called.
             It is a collection of drawable Layer objects, and it has its own draw() method.
@@ -3448,6 +3452,7 @@ def __init__(self, width=640, height=480, name="NodeBox for OpenGL", resizable=F
                 width = width,
                height = height,
             resizable = resizable,
+                style = border is False and WINDOW_BORDERLESS or WINDOW_DEFAULT,
                config = _configure(settings), 
                 vsync = vsync
         )
@@ -4010,7 +4015,7 @@ def run(self, draw=None, setup=None, update=None, frames=100, sort=CUMULATIVE, t
 
 #--- LIBRARIES ---------------------------------------------------------------------------------------
 # Import the library and assign it a _ctx variable containing the current context.
-# This mimics the behavior in NodeBox.
+# This mimics the behavior in NodeBox for Mac OS X.
 
 def ximport(library):
     from sys import modules

nodebox/graphics/shader.py

@@ -5,8 +5,9 @@
 # Copyright (c) 2008 City In A Bottle (cityinabottle.org)
 # http://cityinabottle.org/nodebox
 
-from pyglet.image import Texture, SolidColorImagePattern
 from pyglet.gl    import *
+from pyglet.image import Texture, SolidColorImagePattern
+from context      import Image, texture
 from geometry     import lerp, clamp
 from math         import radians
 
@@ -1123,8 +1124,6 @@ def __del__(self):
 except OffscreenBufferError:
     _buffer = None
 
-from context import Image, texture
-
 def filter(img, filter=None, clear=True):
     """ Returns a new Image object with the given filter applied to it.
         - img   : an image that can be passed to the image() command.