crystalwindow 5.8__py3-none-any.whl → 5.9__py3-none-any.whl

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/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.dist-info → crystalwindow-5.9.dist-info}/METADATA

@@ -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.dist-info → crystalwindow-5.9.dist-info}/RECORD

@@ -24,11 +24,11 @@ crystalwindow/math.py,sha256=AGhLGkPWozNOMlSieF5u8jSDY0qakOPJIi5aWI9P91o,1598
 crystalwindow/messagebus.py,sha256=9K2P_TkdQ1rt-oouIkRg_XHwMTwykttBt-9gFYaItyI,696
 crystalwindow/objects.py,sha256=BWqjlxOXpaCGeaAocFL5L9Qh-a_MRjbN6Qb-Vd7R0K8,6262
 crystalwindow/scores.py,sha256=O5E-rceNEaRpsC3XZ2PpE5gsLvJk86f4ChA5UNdd4b0,1069
-crystalwindow/sprites.py,sha256=IADCQetFDQoat3qGpKkH93TdtqqgldfHl4N0HKX1Ajc,7480
+crystalwindow/sprites.py,sha256=REkKkKi1oDQBjnjM7fX-49_zsJmTlwpDpoX8PlTohtQ,7599
 crystalwindow/tilemap.py,sha256=endJ8KcbP9EjPvL9qWsOpV4jc_Re1yH080aUyDkwufA,3378
 crystalwindow/ver_warner.py,sha256=qEN3ulc1NixBy15FFx2R3Zu0DhyJTVJwiESGAPwpynM,3373
 crystalwindow/websearch.py,sha256=IgsoKt27yCBHeq8yFVfSq_8sEj5KP6mqn2yNRTsRw1A,5161
-crystalwindow/window.py,sha256=i9VRJyVVMQoLzaHbOuZHsdmtmwXRA9h-pL_Tc8Kb5XY,32327
+crystalwindow/window.py,sha256=yo_Onk0RYEjUMhzKsNXJDBlYYFF9l9Nhbxiza3wf4UY,33128
 crystalwindow/Icons/default_icon.png,sha256=Loq27Pxb8Wb3Sz-XwtNF1RmlLNxR4TcfOWfK-1lWcII,7724
 crystalwindow/Icons/file_icons.png,sha256=kqjvz3gMaIbepW4XGrLZOjDYu-yhFbVxjvylS-0RO4U,5659
 crystalwindow/gametests/3dsquare.py,sha256=MM_RRx1mz_NeBhTAoNomzn_IAbbN4ZnQZWA9VAFL8mY,821
@@ -40,8 +40,8 @@ crystalwindow/gametests/sandbox.py,sha256=Oo2tU2N0y3BPVa6T5vs_h9N6islhQrjSrr_78X
 crystalwindow/gametests/squaremove.py,sha256=ei6DMnvcgpOhmxbGv-Yqmx5EqiZjKbVlZhI7YbT2hY8,643
 crystalwindow/gametests/testtttagain.py,sha256=oIhK9MGgMVly_W2lRwD9Hn9WyPdd8JnX2HGrLTGZdxY,373
 crystalwindow/gametests/windowtesting.py,sha256=_9X6wnV1-_X_PtNS-0zu-k209NtFIwAc4vpxLPp7V2o,97
-crystalwindow-5.8.dist-info/licenses/LICENSE,sha256=Gt5cJRchdNt0guxyQMHKsATN5PM5mjuDhdO6Gzs9qQc,1096
-crystalwindow-5.8.dist-info/METADATA,sha256=Dmffz8ly1Vcfaowu4Hj7IsXF4071v5H-tgxZKV7t-fQ,7523
-crystalwindow-5.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crystalwindow-5.8.dist-info/top_level.txt,sha256=PeQSld4b19XWT-zvbYkvE2Xg8sakIMbDzSzSdOSRN8o,14
-crystalwindow-5.8.dist-info/RECORD,,
+crystalwindow-5.9.dist-info/licenses/LICENSE,sha256=Gt5cJRchdNt0guxyQMHKsATN5PM5mjuDhdO6Gzs9qQc,1096
+crystalwindow-5.9.dist-info/METADATA,sha256=3E8i92v7k5r5ZEalfSSeYpE61uTcKeYsitj3-Q94SI4,7523
+crystalwindow-5.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crystalwindow-5.9.dist-info/top_level.txt,sha256=PeQSld4b19XWT-zvbYkvE2Xg8sakIMbDzSzSdOSRN8o,14
+crystalwindow-5.9.dist-info/RECORD,,