batframework 1.0.9a2__tar.gz → 1.0.9a3__tar.gz

{batframework-1.0.9a2 → batframework-1.0.9a3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batframework
-Version: 1.0.9a2
+Version: 1.0.9a3
 Summary: Pygame framework for making games easier.
 Author-email: Turan Baturay <baturayturan@gmail.com>
 Project-URL: Homepage, https://github.com/TuranBaturay/batFramework

{batframework-1.0.9a2 → batframework-1.0.9a3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batframework"
-version = "1.0.9a2"
+version = "1.0.9a3"
 description = "Pygame framework for making games easier."
 readme = "README.md"
 classifiers = [ "Programming Language :: Python :: 3", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent",]

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/__init__.py

@@ -67,7 +67,8 @@ def init(
     print_version()
     pygame.display.set_caption(window_caption)
     init_screen(resolution, flags, vsync)
-
+    pygame.mixer.init()
+    
     ResourceManager().set_resource_path(
         resource_path if resource_path is not None else "."
     )

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/audioManager.py

@@ -1,7 +1,7 @@
 import batFramework as bf
 import pygame
 
-pygame.mixer.init()
+
 
 
 class AudioManager(metaclass=bf.Singleton):

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/easingController.py

@@ -2,6 +2,7 @@ import pygame
 import batFramework as bf
 from functools import lru_cache
 from .enums import easing
+from typing import Callable,Any
 
 
 @lru_cache(maxsize=None)
@@ -22,11 +23,11 @@ class EasingController(bf.Timer):
         easing_function: easing = easing.LINEAR,
         duration: float = 1,
         update_callback=None,
-        end_callback=None,
+        end_callback: Callable[[],Any]=None,
         loop: bool = False,
     ) -> None:
         self.easing_function = easing_function
-        self.update_callback = update_callback
+        self.update_callback: Callable[[float],Any] = update_callback
         self.value: float = 0.0
         super().__init__(duration, end_callback, loop)
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/button.py

@@ -1,13 +1,13 @@
 from .label import Label
 import batFramework as bf
-from typing import Self, Callable
+from typing import Self, Callable,Any
 from .clickableWidget import ClickableWidget
 import pygame
 from math import ceil
 
 
 class Button(Label, ClickableWidget):
-    def __init__(self, text: str = "", callback: None | Callable = None) -> None:
+    def __init__(self, text: str = "", callback: Callable[[],Any] = None) -> None:
         super().__init__(text=text)
         self.set_callback(callback)
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/clickableWidget.py

@@ -1,6 +1,6 @@
 from .label import Label
 import batFramework as bf
-from typing import Self, Callable
+from typing import Self, Callable, Any
 from .interactiveWidget import InteractiveWidget
 from .shape import Shape
 import pygame
@@ -10,7 +10,7 @@ from math import ceil
 class ClickableWidget(Shape, InteractiveWidget):
     _cache: dict = {}
 
-    def __init__(self, callback: None | Callable = None, *args, **kwargs) -> None:
+    def __init__(self, callback: Callable[[],Any] = None, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
         self.callback = callback
         self.is_pressed: bool = False
@@ -28,8 +28,15 @@ class ClickableWidget(Shape, InteractiveWidget):
         self.set_relief(self.unpressed_relief)
 
     def get_min_required_size(self) -> tuple[float, float]:
-        return self.rect.size.inflate(0,self.unpressed_relief)
-
+        if not (self.autoresize_w or self.autoresize_h):
+            return self.rect.size
+        
+        res = super().get_min_required_size()
+        res = res[0],res[1]+self.unpressed_relief
+        print("hey",res)
+        return res[0] if self.autoresize_w else self.rect.w, (
+            res[1] if self.autoresize_h else self.rect.h
+        )
 
 
     def set_unpressed_relief(self, relief: int) -> Self:
@@ -111,7 +118,7 @@ class ClickableWidget(Shape, InteractiveWidget):
     def is_enabled(self) -> bool:
         return self.enabled
 
-    def set_callback(self, callback: Callable) -> Self:
+    def set_callback(self, callback: Callable[[],Any]) -> Self:
         self.callback = callback
         return self
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/constraints/constraints.py

@@ -41,16 +41,16 @@ class MinWidth(Constraint):
         self.min_width = width
 
     def on_removal(self, child_widget: Widget) -> None:
-            child_widget.set_autoresize_w(False)
+            return
+            # child_widget.set_autoresize_w(False)
 
     def evaluate(self, parent_widget, child_widget):
         res =  child_widget.rect.width >= self.min_width
-        if not res:
-            child_widget.set_autoresize_w(False)
+        # if not res:
+            # child_widget.set_autoresize_w(False)
         return res
 
     def apply_constraint(self, parent_widget, child_widget):
-        child_widget.set_autoresize_w(True)
         child_widget.set_size((self.min_width, None))
 
     def __eq__(self,other:"Constraint")->bool:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/container.py

@@ -106,7 +106,7 @@ class Container(Shape, InteractiveWidget):
         return self
 
     def top_at(self, x: float | int, y: float | int) -> "None|Widget":
-        if self.visible and self.rect.collidepoint(x, y):
+        if self.rect.collidepoint(x, y):
             for child in reversed(self.children):
                 result = child.top_at(x, y)
                 if result is not None:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/debugger.py

@@ -1,5 +1,5 @@
 from .label import Label
-from typing import Self
+from typing import Self,Callable,Any
 import batFramework as bf
 import pygame
 
@@ -11,8 +11,8 @@ def convert_to_int(*args):
 class Debugger(Label):
     def __init__(self) -> None:
         super().__init__("")
-        self.static_data: dict = {}
-        self.dynamic_data: dict = {}
+        self.static_data: dict[str,Any] = {}
+        self.dynamic_data: dict[str,Callable[[],str]] = {}
         self.refresh_rate = 10
         self.refresh_counter: float = 0
         self.add_tags("debugger")
@@ -26,18 +26,18 @@ class Debugger(Label):
         self.static_data[key] = str(data)
         self.update_text()
 
-    def add_dynamic(self, key: str, func) -> None:
+    def add_dynamic(self, key: str, func:Callable[[],str]) -> None:
         self.dynamic_data[key] = func
         self.update_text()
 
-    def remove_static(self, key) -> bool:
+    def remove_static(self, key:str) -> bool:
         try:
             self.static_data.pop(key)
             return True
         except KeyError:
             return False
 
-    def remove_dynamic(self, key) -> bool:
+    def remove_dynamic(self, key:str) -> bool:
         try:
             self.dynamic_data.pop(key)
             return True

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/image.py

@@ -37,6 +37,12 @@ class Image(Shape):
             )
         super().build()
 
+    def get_min_required_size(self) -> tuple[float, float]:
+        res = self.rect.size
+        return self.inflate_rect_by_padding((0, 0, *res)).size
+
+
+
 
     def from_path(self, path: str) -> Self:
         tmp = bf.ResourceManager().get_image(path, self.convert_alpha)

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/indicator.py

@@ -1,5 +1,5 @@
 from .shape import Shape
-from typing import Any, Self
+from typing import Any, Self, Callable
 import pygame
 from .widget import Widget
 from .interactiveWidget import InteractiveWidget
@@ -37,7 +37,7 @@ class ToggleIndicator(Indicator):
         # TODO aspect ratio would be good right about here
         # self.add_constraint(ConstraintAspectRatio(1))
 
-    def set_callback(self, callback) -> Self:
+    def set_callback(self, callback : Callable[[bool],Any]) -> Self:
         self.callback = callback
         return self
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/layout.py

@@ -273,7 +273,7 @@ class RowFill(Row):
         super().__init__(gap, spacing)
 
     def arrange(self) -> None:
-        if self.parent.autoresize_h :
+        if self.parent.autoresize_w :
            super().arrange() 
            return
         if not self.parent or not self.parent.children:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/radioButton.py

@@ -45,9 +45,9 @@ class RadioVariable:
     def __init__(self) -> None:
         self.buttons: list[RadioButton] = []
         self.value = None
-        self.modify_callback: Callable[[Any],] = None
+        self.modify_callback: Callable[[bool],Any] = None
 
-    def set_modify_callback(self, callback) -> Self:
+    def set_modify_callback(self, callback:Callable[[bool],Any]) -> Self:
         self.modify_callback = callback
         return self
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/root.py

@@ -138,6 +138,15 @@ class Root(InteractiveWidget):
         if self.hovered and isinstance(self.hovered, InteractiveWidget):
             self.hovered.on_enter()
 
+    def apply_updates(self):
+        if any(child.dirty_shape for child in self.children):
+            self.dirty_shape = True  # Mark layout as dirty if any child changed size
+
+        if self.dirty_shape:
+            for child in self.children:
+                child.apply_updates()
+            self.dirty_shape = False
+
     def draw(self, camera: bf.Camera) -> None:
         super().draw(camera)
         if (

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/slider.py

@@ -66,7 +66,7 @@ class Slider(Button):
         super().__init__(text, None)
         self.gap: float | int = 0
         self.spacing: bf.spacing = bf.spacing.MANUAL
-        self.modified_callback = None
+        self.modified_callback : Callable[[float],Any] = None
         self.meter: SliderMeter = SliderMeter()
         self.handle = SliderHandle()
         self.add(self.meter, self.handle)
@@ -102,7 +102,7 @@ class Slider(Button):
         self.dirty_shape = True
         return self
 
-    def set_modify_callback(self, callback) -> Self:
+    def set_modify_callback(self, callback : Callable[[float],Any]) -> Self:
         self.modified_callback = callback
         return self
 
@@ -175,6 +175,7 @@ class Slider(Button):
         if not self.text_rect:
             self.text_rect.size = self._get_text_rect_required_size()
         w, h = self.text_rect.size
+        h+=self.unpressed_relief
         return self.inflate_rect_by_padding((0, 0, w + gap + self.meter.get_min_required_size()[1], h)).size
 
     def _build_layout(self) -> None:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/styleManager.py

@@ -39,6 +39,12 @@ class StyleManager(metaclass=Singleton):
         self.lookup = {key: False for key in self.lookup}
         self.update()
 
+    def update_forced(self):
+       for widget in self.widgets:
+            for style in self.styles:
+                style.apply(widget)
+            self.lookup[widget] = True
+
     def update(self):
         for widget in self.widgets:
             if self.lookup[widget]:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/textInput.py

@@ -140,7 +140,7 @@ class TextInput(Label, InteractiveWidget):
         lines = self.text.split('\n')
         line_x, line_y = self.cursor_position
 
-        height = self.font_object.get_point_size()
+        height = self.font_object.get_linesize()
 
         cursor_y = self.get_padded_rect().__getattribute__(self.alignment.value)[1] - self.rect.top
         cursor_y += line_y * height
@@ -248,10 +248,8 @@ class TextInput(Label, InteractiveWidget):
             return
         cursor_rect = self.get_cursor_rect()
         cursor_rect.move_ip(-self.scroll)
-
         
         pygame.draw.rect(self.surface, bf.color.CLOUD, cursor_rect.inflate(2,2))
-
         pygame.draw.rect(self.surface, self.text_color, cursor_rect)
 
     def paint(self) -> None:
@@ -272,9 +270,9 @@ class TextInput(Label, InteractiveWidget):
 
         
         if cursor_rect.right > area.right+self.scroll.x:
-            self.scroll.x=cursor_rect.right - area.right
+            self.scroll.x=cursor_rect.right - area.right - cursor_rect.w*2 
         elif cursor_rect.x < self.scroll.x+area.left:
-            self.scroll.x= cursor_rect.left - area.left 
+            self.scroll.x= cursor_rect.left - area.left
         self.scroll.x = max(self.scroll.x,0)
 
         if cursor_rect.bottom > area.bottom + self.scroll.y:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/toggle.py

@@ -1,12 +1,12 @@
 from .button import Button
 from .indicator import Indicator, ToggleIndicator
 import batFramework as bf
-from typing import Self
+from typing import Self,Callable,Any
 import pygame
 
 
 class Toggle(Button):
-    def __init__(self, text: str = "", callback=None, default_value: bool = False) -> None:
+    def __init__(self, text: str = "", callback : Callable[[bool],Any]=None, default_value: bool = False) -> None:
         self.value: bool = default_value
         self.indicator: ToggleIndicator = ToggleIndicator(default_value)
         self.gap: float | int = 0
@@ -59,7 +59,7 @@ class Toggle(Button):
                 self.indicator.get_min_required_size()[0],
                 self.text_rect.w + self.font_object.point_size + (self.gap if self.text else 0),
             ),
-            self.text_rect.h,
+            self.text_rect.h+self.unpressed_relief,
         )
         return self.inflate_rect_by_padding((0, 0, *size)).size
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/gui/widget.py

@@ -174,11 +174,11 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         return self.rect.bottom - self.padding[3]
 
     def get_debug_outlines(self):
-        if not self.visible:
-            return
-        yield (self.rect, self.debug_color)
-        if any(self.padding):
-            yield (self.get_padded_rect(), self.debug_color)
+        if self.visible:
+            if any(self.padding):
+                yield (self.get_padded_rect(), self.debug_color)
+            else:
+                yield (self.rect, self.debug_color)
         for child in self.children:
             yield from child.get_debug_outlines()
 
@@ -272,11 +272,11 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
     def top_at(self, x: float | int, y: float | int) -> "None|Widget":
         if self.children:
             for child in reversed(self.children):
-                if child.visible:
-                    r = child.top_at(x, y)
-                    if r is not None:
-                        return r
-        return self if self.visible and self.rect.collidepoint(x, y) else None
+                # if child.visible:
+                r = child.top_at(x, y)
+                if r is not None:
+                    return r
+        return self if  self.rect.collidepoint(x, y) else None
 
     def add(self, *children: "Widget") -> Self:
         self.children.extend(children)
@@ -387,20 +387,27 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
 
 
     def apply_updates(self) -> None:
-        # Step 1: Build shape if needed
+
+        if self.dirty_constraints:
+            self.resolve_constraints()  # Finalize positioning based on final size
+            self.dirty_constraints = False
+
+        # Build shape if needed
         if self.dirty_shape:
             self.build()  # Finalize widget size
             self.dirty_shape = False
             self.dirty_surface = True
+            self.dirty_constraints = True
             # Propagate dirty_constraints to children in case size affects their position
             for child in self.children:
                 child.dirty_constraints = True
 
-        # Step 2: Resolve constraints now that size is finalized
+        # Resolve constraints now that size is finalized
         if self.dirty_constraints:
             self.resolve_constraints()  # Finalize positioning based on final size
             self.dirty_constraints = False
 
+
         # Step 3: Paint the surface if flagged as dirty
         if self.dirty_surface:
             self.paint()

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/timeManager.py

@@ -1,13 +1,12 @@
 import batFramework as bf
-from typing import Self
-from typing import Callable, Union, Self
+from typing import Callable, Union, Self,Any
 
 
 class Timer:
     _count: int = 0
     _available_ids: set[int] = set()
 
-    def __init__(self, duration: Union[float, int], end_callback: Callable, loop: bool = False, register: str = "global") -> None:
+    def __init__(self, duration: Union[float, int], end_callback: Callable[[],Any], loop: bool = False, register: str = "global") -> None:
         if Timer._available_ids:
             self.uid = Timer._available_ids.pop()
         else:

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/transition.py

@@ -1,5 +1,5 @@
 import batFramework as bf
-from typing import Self
+from typing import Self,Callable,Any
 import pygame
 
 """
@@ -23,24 +23,24 @@ class Transition:
             update_callback=self.update,
             end_callback=self.end,
         )
-        self.start_callback = None
-        self.update_callback = None
-        self.end_callback = None
+        self.start_callback : Callable[[],Any] = None
+        self.update_callback : Callable[[float],Any]= None
+        self.end_callback : Callable[[],Any]= None
         self.source: pygame.Surface = None
         self.dest: pygame.Surface = None
 
     def __repr__(self) -> str:
         return f"Transition {self.__class__},{self.duration}"
 
-    def set_start_callback(self, func) -> Self:
+    def set_start_callback(self, func : Callable[[],Any]) -> Self:
         self.start_callback = func
         return self
 
-    def set_update_callback(self, func) -> Self:
+    def set_update_callback(self, func : Callable[[float],Any]) -> Self:
         self.update_callback = func
         return self
 
-    def set_end_callback(self, func) -> Self:
+    def set_end_callback(self, func : Callable[[],Any]) -> Self:
         self.end_callback = func
         return self
 
@@ -118,7 +118,7 @@ class FadeColor(Transition):
     def transition_to_end(self):
         self.next_step(self.end)
 
-    def next_step(self, callback=None) -> None:
+    def next_step(self, callback : Callable[[],Any]=None) -> None:
         self.index += 1
         if callback:
             callback()

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batFramework/triggerZone.py

@@ -1,8 +1,8 @@
 import batFramework as bf
-
+from typing import Callable,Any
 
 class TriggerZone(bf.Entity):
-    def __init__(self, size, trigger, callback, active=True) -> None:
+    def __init__(self, size, trigger, callback: Callable[[Any],Any], active=True) -> None:
         super().__init__(size, True)
         self.set_debug_color(bf.color.RED)
         self.active = active
@@ -13,7 +13,7 @@ class TriggerZone(bf.Entity):
         self.trigger = trigger
         return self
 
-    def set_callback(self, callback):
+    def set_callback(self, callback: Callable[[Any],Any]):
         self.callback = callback
         return self
 

{batframework-1.0.9a2 → batframework-1.0.9a3}/src/batframework.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batframework
-Version: 1.0.9a2
+Version: 1.0.9a3
 Summary: Pygame framework for making games easier.
 Author-email: Turan Baturay <baturayturan@gmail.com>
 Project-URL: Homepage, https://github.com/TuranBaturay/batFramework