crystalwindow 5.8__tar.gz → 5.9__tar.gz

{crystalwindow-5.8/crystalwindow.egg-info → crystalwindow-5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crystalwindow
-Version: 5.8
+Version: 5.9
 Summary: A Tkinter powered window + GUI toolkit made by Crystal (ME)! Easier apps, smoother UI and all-in-one helpers!, Gui, Buttons, FileHelper, Sprites, Animations, Colors, Math, Gravity, Camera, 3D and more!
 Home-page: https://pypi.org/project/crystalwindow/
 Author: CrystalBallyHereXD

{crystalwindow-5.8 → crystalwindow-5.9}/crystalwindow/sprites.py

@@ -72,6 +72,10 @@ class Sprite:
         """Create sprite using a simple rectangle"""
         return cls(pos, size=(w, h), color=color)
 
+    @classmethod
+    def group(cls, *sprites):
+        """Create a list of sprites"""
+        return list(sprites)
 
     # === MOVE / DRAW ===
     def draw(self, win, cam=None):

{crystalwindow-5.8 → crystalwindow-5.9}/crystalwindow/window.py

@@ -218,6 +218,14 @@ class Window:
         
         return False
 
+    def keys_combined(self, *keys):
+        for key in keys:
+            if isinstance(key, str):
+                key = self.KEY_MAP.get(key, key)
+            if not self.keys.get(key, False):
+                return False
+        return True
+
     def key_held(self, key):
         if isinstance(key, str):
             key = self.KEY_MAP.get(key, key)
@@ -533,6 +541,14 @@ class Window:
         bold = kwargs.pop("bold", False)
         italic = kwargs.pop("italic", False)
 
+        pil_font = None
+
+        if hasattr(font, "font"):
+            pil_font = font.font
+            font_name = font.font_name
+        else:
+            font_name = font    
+
         # scale
         scaled_size = size
 
@@ -549,9 +565,9 @@ class Window:
 
         # tkinter font tuple
         if style:
-            font_tuple = (font, scaled_size, style)
+            font_tuple = (font_name, scaled_size, style)
         else:
-            font_tuple = (font, scaled_size)
+            font_tuple = (font_name, scaled_size)
 
         # ---------------- NORMAL COLOR TEXT ----------------
         if mode != "texture":
@@ -579,10 +595,19 @@ class Window:
         from PIL import Image, ImageDraw, ImageFont, ImageTk
 
         # try load font with style
-        try:
-            fnt = ImageFont.truetype(font + ".ttf", scaled_size)
-        except:
-            fnt = ImageFont.load_default()
+        # choose correct PIL font
+        if pil_font and hasattr(font, "font_path") and font.font_path:
+            try:
+                fnt = ImageFont.truetype(font.font_path, scaled_size)
+            except:
+                fnt = ImageFont.load_default()
+        elif pil_font:
+            fnt = pil_font
+        else:
+            try:
+                fnt = ImageFont.truetype(font_name + ".ttf", scaled_size)
+            except:
+                fnt = ImageFont.load_default()
 
         # measure text
         temp = Image.new("L", (1, 1), 0)

{crystalwindow-5.8 → crystalwindow-5.9/crystalwindow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crystalwindow
-Version: 5.8
+Version: 5.9
 Summary: A Tkinter powered window + GUI toolkit made by Crystal (ME)! Easier apps, smoother UI and all-in-one helpers!, Gui, Buttons, FileHelper, Sprites, Animations, Colors, Math, Gravity, Camera, 3D and more!
 Home-page: https://pypi.org/project/crystalwindow/
 Author: CrystalBallyHereXD

{crystalwindow-5.8 → crystalwindow-5.9}/setup.py

@@ -7,7 +7,7 @@ with open("README.md", encoding="utf-8") as f:
 
 setup(
     name="crystalwindow",
-    version="5.8",  # Force metadata refresh
+    version="5.9",  # Force metadata refresh
     packages=find_packages(include=["crystalwindow", "crystalwindow.*"]),
 
     include_package_data=True,  # include package_data files