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

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/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/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)