pyglet 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

pyglet/gui/frame.py

@@ -32,7 +32,7 @@ class Frame:
                 The cell ("bucket") size for each cell in the hash.
                 Widgets may span multiple cells.
             order:
-                Widgets use internal OrderedGroups for draw sorting.
+                Widgets use internal ordered Groups for draw sorting.
                 This is the base value for these Groups.
         """
         self._window = window
@@ -149,7 +149,7 @@ class MovableFrame(Frame):
     When a specified modifier key is held down, Widgets can be
     repositioned by dragging them. Examples of modifier keys are
     Ctrl, Alt, Shift. These are defined in the `pyglet.window.key`
-    module, and start witih `MOD_`. For example::
+    module, and start with `MOD_`. For example::
 
         from pyglet.window.key import MOD_CTRL
 
@@ -163,7 +163,7 @@ class MovableFrame(Frame):
         """Create an instance of a MovableFrame.
 
         This is a similar to the standard Frame class, except that
-        you can specify a modifer key. When this key is held down,
+        you can specify a modifier key. When this key is held down,
         Widgets can be re-positioned by drag-and-dropping.
 
         Args:
@@ -173,7 +173,7 @@ class MovableFrame(Frame):
             enable:
                 Whether to enable frame.
             order:
-                Widgets use internal OrderedGroups for draw sorting.
+                Widgets use internal ordered Groups for draw sorting.
                 This is the base value for these Groups.
             modifier:
                 A key modifier, such as `pyglet.window.key.MOD_CTRL`

pyglet/gui/widgets.py

@@ -370,7 +370,12 @@ class Slider(WidgetBase):
 
     def _update_position(self) -> None:
         self._base_spr.position = self._x, self._y, 0
-        self._knob_spr.position = self._x + self._edge, self._y + self._base_img.height / 2, 0
+        self._min_knob_x = self._x + self._edge
+        self._max_knob_x = self._x + self._base_img.width - self._knob_img.width - self._edge
+        x = (self._max_knob_x - self._min_knob_x) * self._value / 100 + self._min_knob_x + self._half_knob_width
+        x = max(self._min_knob_x, min(x - self._half_knob_width, self._max_knob_x))
+        y = self._y + self._base_img.height / 2
+        self._knob_spr.position = x, y, 0
 
     @property
     def value(self) -> float:

pyglet/image/__init__.py

@@ -1258,8 +1258,6 @@ class Texture(AbstractImage):
 
         return cls(width, height, target, tex_id.value, min_filter, mag_filter)
 
-        return texture
-
     def get_image_data(self, z: int = 0) -> ImageData:
         """Get the image data of this texture.
 

pyglet/image/codecs/bmp.py

@@ -11,14 +11,12 @@ encoding.  Alpha channel is supported for 32-bit BI_RGB only.
 # http://www.fileformat.info/format/bmp/egff.htm
 
 import ctypes
+from ctypes.wintypes import DWORD, LONG, WORD
 
 from pyglet.image import ImageData
-from pyglet.image.codecs import ImageDecoder, ImageDecodeException
+from pyglet.image.codecs import ImageDecodeException, ImageDecoder
+from pyglet.libs.win32.types import BYTE
 
-BYTE = ctypes.c_ubyte
-WORD = ctypes.c_uint16
-DWORD = ctypes.c_uint32
-LONG = ctypes.c_int32
 FXPT2DOT30 = ctypes.c_uint32
 
 BI_RGB = 0

pyglet/image/codecs/dds.py

@@ -86,7 +86,7 @@ class DDSURFACEDESC2(_FileStruct):
     ]
 
     def __init__(self, data):
-        super(DDSURFACEDESC2, self).__init__(data)
+        super().__init__(data)
         self.ddpfPixelFormat = DDPIXELFORMAT(self.ddpfPixelFormat)
 
 

pyglet/image/codecs/gdiplus.py

@@ -1,11 +1,30 @@
-from pyglet.libs.win32.com import pIUnknown
-from pyglet.image import *
-from pyglet.image.codecs import *
-from pyglet.libs.win32.constants import *
-from pyglet.libs.win32.types import *
+from ctypes import (
+    POINTER,
+    Structure,
+    c_buffer,
+    c_byte,
+    c_float,
+    c_long,
+    c_short,
+    c_uint32,
+    c_ulong,
+    c_void_p,
+    c_wchar,
+    c_wchar_p,
+    cast,
+    create_string_buffer,
+    memmove,
+    windll,
+)
+from ctypes.wintypes import BOOL, BYTE, INT, UINT, ULONG
+
+from pyglet.image import Animation, AnimationFrame, ImageData, byref, c_int, c_uint, sizeof
+from pyglet.image.codecs import ImageDecodeException, ImageDecoder
 from pyglet.libs.win32 import _kernel32 as kernel32
 from pyglet.libs.win32 import _ole32 as ole32
-
+from pyglet.libs.win32.com import pIUnknown
+from pyglet.libs.win32.constants import GMEM_MOVEABLE
+from pyglet.libs.win32.types import LONG_PTR
 
 gdiplus = windll.gdiplus
 
@@ -248,13 +267,13 @@ class GDIPlusDecoder(ImageDecoder):
         if not file:
             file = open(filename, 'rb')
         bitmap = self._load_bitmap(filename, file)
-        
+
         dimension_count = c_uint()
         gdiplus.GdipImageGetFrameDimensionsCount(bitmap, byref(dimension_count))
         if dimension_count.value < 1:
             self._delete_bitmap(bitmap)
             raise ImageDecodeException('Image has no frame dimensions')
-        
+
         # XXX Make sure this dimension is time?
         dimensions = (c_void_p * dimension_count.value)()
         gdiplus.GdipImageGetFrameDimensionsList(bitmap, dimensions, dimension_count.value)
@@ -274,7 +293,7 @@ class GDIPlusDecoder(ImageDecoder):
         delays = cast(prop_item.value, POINTER(c_long * n_delays)).contents
 
         frames = []
-        
+
         for i in range(frame_count.value):
             gdiplus.GdipImageSelectActiveFrame(bitmap, dimensions, i)
             image = self._get_image(bitmap)