batframework 1.0.9a7__py3-none-any.whl → 1.0.9a9__py3-none-any.whl

batFramework/gui/widget.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Self, Callable
+from typing import TYPE_CHECKING, Self, Callable, Any
 from collections.abc import Iterable
 import batFramework as bf
 import pygame
@@ -6,13 +6,13 @@ import pygame
 if TYPE_CHECKING:
     from .constraints.constraints import Constraint
     from .root import Root
-MAX_CONSTRAINTS = 10
 
+MAX_ITERATIONS = 10
 
 class WidgetMeta(type):
     def __call__(cls, *args, **kwargs):
         obj = type.__call__(cls, *args, **kwargs)
-        bf.StyleManager().register_widget(obj)
+        bf.gui.StyleManager().register_widget(obj)
         return obj
 
 
@@ -25,15 +25,21 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         self.do_sort_children = False
         self.clip_children: bool = True
         self.padding = (0, 0, 0, 0)
-        self.dirty_surface: bool = True  #  if true will call paint before drawing
-        self.dirty_shape: bool = True  #    if true will call (build+paint) before drawing
-        self.dirty_constraints: bool = False # if true will call resolve_constraints
+        self.dirty_surface: bool = True  # If true, will call paint before drawing
+        self.dirty_shape: bool = True  # If true, will call (build+paint) before drawing
+        self.dirty_position_constraints: bool = True  # Flag for position-related constraints
+        self.dirty_size_constraints: bool = True  # Flag for size-related constraints
 
+        self.tooltip_text: str | None = None  # If not None, will display a text when hovered
         self.is_root: bool = False
-        self.autoresize_w, self.autoresize_h = True, True
-        self.__constraint_iteration = 0
-        self.__constraints_to_ignore = []
-        self.__constraints_capture = None
+        self.autoresize_w, self.autoresize_h = True, True  # If True, the widget will have dynamic size depending on its contents
+        self._constraint_iteration = 0
+        self._constraints_to_ignore: list[Constraint] = []
+        self._constraints_capture: list[Constraint] = []
+
+    def set_tooltip_text(self,text:str|None)->Self:
+        self.tooltip_text = text
+        return self
 
     def show(self) -> Self:
         self.visit(lambda w: w.set_visible(True))
@@ -43,6 +49,14 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         self.visit(lambda w: w.set_visible(False))
         return self
 
+    def kill(self):
+        if self.parent:
+            self.parent.remove(self)
+        if self.parent_scene:
+            self.parent_scene.remove(self.parent_layer.name,self)
+            
+        return super().kill()
+
     def set_clip_children(self, value: bool) -> Self:
         self.clip_children = value
         self.dirty_surface = True
@@ -72,7 +86,7 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
             self.parent.do_sort_children = True
         return self
 
-    def inflate_rect_by_padding(
+    def expand_rect_with_padding(
         self, rect: pygame.Rect | pygame.FRect
     ) -> pygame.Rect | pygame.FRect:
         return pygame.FRect(
@@ -112,12 +126,18 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
     def set_parent_scene(self, parent_scene: bf.Scene | None) -> Self:
         super().set_parent_scene(parent_scene)
         if parent_scene is None:
-            bf.StyleManager().remove_widget(self)
+            bf.gui.StyleManager().remove_widget(self)
 
         for c in self.children:
             c.set_parent_scene(parent_scene)
         return self
 
+    def set_parent_layer(self, layer):
+        super().set_parent_layer(layer)
+        for c in self.children:
+            c.set_parent_layer(layer)
+        return self
+
     def set_parent(self, parent: "Widget") -> Self:
         if parent == self.parent:
             return self
@@ -142,7 +162,7 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         self.dirty_shape = True
         return self
 
-    def get_padded_rect(self) -> pygame.FRect:
+    def get_inner_rect(self) -> pygame.FRect:
         r = self.rect.inflate(
             -self.padding[0] - self.padding[2], -self.padding[1] - self.padding[3]
         )
@@ -152,48 +172,53 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
     def get_min_required_size(self) -> tuple[float, float]:
         return self.rect.size
 
-    def get_padded_width(self) -> float:
+    def get_inner_width(self) -> float:
         return self.rect.w - self.padding[0] - self.padding[2]
 
-    def get_padded_height(self) -> float:
+    def get_inner_height(self) -> float:
         return self.rect.h - self.padding[1] - self.padding[3]
 
-    def get_padded_left(self) -> float:
+    def get_inner_left(self) -> float:
         return self.rect.left + self.padding[0]
 
-    def get_padded_right(self) -> float:
-        return self.rect.right + self.padding[2]
+    def get_inner_right(self) -> float:
+        return self.rect.right - self.padding[2]
 
-    def get_padded_center(self) -> tuple[float, float]:
-        return self.get_padded_rect().center
+    def get_inner_center(self) -> tuple[float, float]:
+        return self.get_inner_rect().center
 
-    def get_padded_top(self) -> float:
+    def get_inner_top(self) -> float:
         return self.rect.y + self.padding[1]
 
-    def get_padded_bottom(self) -> float:
+    def get_inner_bottom(self) -> float:
         return self.rect.bottom - self.padding[3]
 
     def get_debug_outlines(self):
         if self.visible:
             if any(self.padding):
-                yield (self.get_padded_rect(), self.debug_color)
-            else:
-                yield (self.rect, self.debug_color)
+                yield (self.get_inner_rect(), self.debug_color)
+            # else:
+            yield (self.rect, self.debug_color)
         for child in self.children:
             yield from child.get_debug_outlines()
 
     def add_constraints(self, *constraints: "Constraint") -> Self:
-        self.constraints.extend(constraints)
-        seen = set()
-        result = []
-        for c in self.constraints:
-            if not any(c == o for o in seen):
-                result.append(c)
-                seen.add(c.name)
-        self.constraints = result
+        # Add constraints without duplicates
+        existing_names = {c.name for c in self.constraints}
+        new_constraints = [c for c in constraints if c.name not in existing_names]
+        self.constraints.extend(new_constraints)
+
+        # Sort constraints by priority
         self.constraints.sort(key=lambda c: c.priority)
-        self.dirty_constraints = True
-        self.__constraint_to_ignore = []
+
+        # Update dirty flags based on the new constraints
+        if any(c.affects_size for c in new_constraints):
+            self.dirty_size_constraints = True
+        if any(c.affects_position for c in new_constraints):
+            self.dirty_position_constraints = True
+
+        # Clear ignored constraints
+        self._constraints_to_ignore = []
 
         return self
 
@@ -202,61 +227,90 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         for c in self.constraints:
             if c.name in names:
                 c.on_removal(self)
-        self.constraints = [c for c in self.constraints if c.name not in names]
-        self.__constraint_to_ignore = []
+        self.constraints = [c for c in self.constraints if c.name not in names]        
+        self._constraints_to_ignore = []
+        self.dirty_size_constraints = True
+        self.dirty_position_constraints= True
+
         return self
 
-    def resolve_constraints(self) -> None:
+
+    def resolve_constraints(self, size_only: bool = False, position_only: bool = False) -> None:
+        """
+        Resolve constraints affecting size and/or position independently.
+
+        This system attempts to apply constraints iteratively until a stable solution is found,
+        or until MAX_ITERATIONS is reached.
+        """
         if self.parent is None or not self.constraints:
-            self.dirty_constraints = False
+            if size_only:
+                self.dirty_size_constraints = False
+            if position_only:
+                self.dirty_position_constraints = False
             return
 
-        if not self.__constraint_iteration:
-            self.__constraints_capture = None
+        # If not currently resolving constraints, reset tracking lists
+        if not self._constraint_iteration:
+            self._constraints_capture = []
         else:
-            capture = tuple([c.priority for c in self.constraints])
-            if capture != self.__constraints_capture:
-                self.__constraints_capture = capture
-                self.__constraint_to_ignore = []
-                
-        constraints = self.constraints.copy()
-        # If all are resolved early exit
-        if all(c.evaluate(self.parent,self) for c in constraints if c not in self.__constraint_to_ignore):
-            self.dirty_constraints = False
-            return
-        
-        # # Here there might be a conflict between 2 or more constraints
-        # we have to determine which ones causes conflict and ignore the one with least priority
-
-        stop = False
-
-        while True:
-            stop = True
-            # first pass with 2 iterations to sort out the transformative constraints
-            for _ in range(2):
-                for c in constraints:
-                    if c in self.__constraints_to_ignore:continue
-                    if not c.evaluate(self.parent,self) :
-                        # print(c," is applied")
-                        c.apply(self.parent,self)
-            # second pass where we check conflicts
-            for c in constraints:
-                if c in self.__constraints_to_ignore:
-                    continue
-                if not c.evaluate(self.parent,self):
-                    # first pass invalidated this constraint
-                    self.__constraints_to_ignore.append(c)
-                    stop = False
-                    break
-
-            if stop: 
-                break
+            # Detect constraint priority changes since last resolution
+            current_priorities = [c.priority for c in self.constraints]
+            if current_priorities != self._constraints_capture:
+                self._constraints_capture = current_priorities
+                self._constraints_to_ignore = []
+
+        # Filter constraints based on what needs resolving
+        def is_relevant(c: "Constraint") -> bool:
+            return (
+                c.affects_size if size_only else
+                c.affects_position if position_only else
+                True
+            )
 
-        if self.__constraints_to_ignore:
-            print("Constraints ignored : ",[str(c) for c in self.__constraints_to_ignore])
-            
-        self.dirty_constraints = False
-        # print(self,self.uid,"resolve constraints : Success")
+        active_constraints = [c for c in self.constraints if is_relevant(c)]
+        active_constraints.sort(key=lambda c: c.priority, reverse=True)
+
+        resolved = []
+        for iteration in range(MAX_ITERATIONS):
+            self._constraint_iteration += 1
+            changed = False
+
+            for constraint in active_constraints:
+                if constraint in resolved:
+                    # Re-evaluate to confirm the constraint is still satisfied
+                    if not constraint.evaluate(self.parent, self):
+                        resolved.remove(constraint)
+                        changed = True
+                else:
+                    # Try applying unresolved constraint
+                    if constraint.apply(self.parent, self):
+                        resolved.append(constraint)
+                        changed = True
+
+            if not changed:
+                break  # All constraints stable — done
+
+        # If solution is still unstable, record the unresolved ones
+        if self._constraint_iteration >= MAX_ITERATIONS:
+            self._constraints_to_ignore += [
+                c for c in active_constraints if c not in resolved
+            ]
+
+        # Record final resolved constraints for debugging/tracking
+        self._constraints_capture.clear()
+        self._constraints_capture.extend(
+            (c, self._constraint_iteration) for c in resolved
+        )
+
+        # Clear appropriate dirty flags
+        if size_only:
+            self.dirty_size_constraints = False
+        if position_only:
+            self.dirty_position_constraints = False
+
+        # Debug print for ignored constraints
+        # if self._constraints_to_ignore:
+            # print(f"{self} ignored constraints: {[str(c) for c in self._constraints_to_ignore]}")
 
 
     def has_constraint(self, name: str) -> bool:
@@ -269,42 +323,50 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
             return self.parent.get_root()
         return None
 
+    def get_by_tags(self,*tags: str)->list["Widget"]:
+        #use self.has_tags(*tags) for check
+        result = []
+        self.visit(lambda w: result.append(w) if w.has_tags(*tags) else None)
+        return result
+    
     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.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.visible and self.rect.collidepoint(x, y) else None
 
     def add(self, *children: "Widget") -> Self:
         self.children.extend(children)
         i = len(self.children)
         for child in children:
-
-            child.set_render_order(i).set_parent(self).set_parent_scene(
-                self.parent_scene
-            )
+            if child.render_order == 0:
+                child.set_render_order(i+1)
+            child.set_parent(self)
+            child.set_parent_layer(self.parent_layer)
+            child.set_parent_scene(self.parent_scene)
             i += 1
         if self.parent:
             self.parent.do_sort_children = True
         return self
 
     def remove(self, *children: "Widget") -> Self:
-        for child in self.children:
+        for child in self.children.copy():
             if child in children:
-                child.set_parent(None).set_parent_scene(None)
+                child.set_parent(None)
+                child.set_parent_scene(None)
+                child.set_parent_layer(None)
                 self.children.remove(child)
         if self.parent:
             self.parent.do_sort_children = True
 
-    def set_size_if_autoresize(self, size: tuple[float, float]) -> Self:
-        size = list(size)
-        size[0] = size[0] if self.autoresize_w else None
-        size[1] = size[1] if self.autoresize_h else None
-        self.set_size(size)
-        return self
+    def resolve_size(self, target_size):
+        return (
+            target_size[0] if self.autoresize_w else self.rect.w,
+            target_size[1] if self.autoresize_h else self.rect.h
+        )
 
     def set_size(self, size: tuple) -> Self:
         size = list(size)
@@ -312,8 +374,7 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
             size[0] = self.rect.w
         if size[1] is None:
             size[1] = self.rect.h
-        if (int(size[0]),int(size[1])) == (int(self.rect.w),int(self.rect.h)):
-            return self
+        if size[0] == self.rect.w and size[1] == self.rect.h : return self
         self.rect.size = size
         self.dirty_shape = True
         return self
@@ -331,21 +392,28 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         _ = [c.update(dt) for c in self.children]
         super().update(dt)
 
-    def build(self) -> None:
+    def build(self) -> bool:
+        """
+        Updates the size of the widget.
+        return True if size changed
+        """
         new_size = tuple(map(int, self.rect.size))
-        if self.surface.get_size() != new_size:
-            old_alpha = self.surface.get_alpha()
-            new_size = [max(0, i) for i in new_size]
-            self.surface = pygame.Surface(new_size, self.surface_flags)
-            if self.convert_alpha:
-                self.surface = self.surface.convert_alpha()
-            self.surface.set_alpha(old_alpha)
+        if self.surface.size == new_size:
+            return False
+        
+        old_alpha = self.surface.get_alpha()
+        new_size = [max(0, i) for i in new_size]
+        self.surface = pygame.Surface(new_size, self.surface_flags)
+        if self.convert_alpha:
+            self.surface = self.surface.convert_alpha()
+        self.surface.set_alpha(old_alpha)
+        return True
 
     def paint(self) -> None:
         self.surface.fill((0, 0, 0, 0))
         return self
 
-    def visit(self, func: Callable, top_down: bool = True, *args, **kwargs) -> None:
+    def visit(self, func: Callable[["Widget"],Any], top_down: bool = True, *args, **kwargs) -> None:
         if top_down:
             func(self, *args, **kwargs)
         for child in self.children:
@@ -378,7 +446,7 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         w = self
         tmp = w
         while not tmp.is_root:
-            if tmp.dirty_constraints or tmp.dirty_shape:
+            if tmp.dirty_size_constraints or tmp.dirty_shape:
                 w = tmp
             if not tmp.parent:
                 break
@@ -386,49 +454,68 @@ class Widget(bf.Drawable, metaclass=WidgetMeta):
         return w
 
 
-    def apply_updates(self) -> None:
-
-        if self.dirty_constraints:
-            self.resolve_constraints()  # Finalize positioning based on final size
-            self.dirty_constraints = False
+    def apply_updates(self,pass_type):
+        # print(f"Apply updates {pass_type} called on {self}")
+        if pass_type == "pre":
+            self.apply_pre_updates()
+            for child in self.children:
+                child.apply_updates("pre")
+        elif pass_type == "post":
+            for child in self.children:
+                child.apply_updates("post")
+            self.apply_post_updates()
+
+    def apply_pre_updates(self):
+        """
+        TOP TO BOTTOM
+        Resolves size-related constraints before propagating updates to children.
+        """
+        if self.dirty_size_constraints:
+            self.resolve_constraints(size_only=True)
+            self.dirty_size_constraints = False
+            self.dirty_position_constraints = True
+
+    def apply_post_updates(self, skip_draw: bool = False):
+        """
+        BOTTOM TO TOP
+        Resolves position-related constraints after propagating updates from children.
+        """
 
-        # Build shape if needed
         if self.dirty_shape:
-            self.build()  # Finalize widget size
+            
+            if self.build():
+                self.dirty_size_constraints = True
+                self.dirty_position_constraints = True
+                if self.parent :
+                # trigger layout or constraint updates in parent
+                    from .container import Container
+                    if self.parent and isinstance(self.parent, Container):
+                        self.parent.dirty_layout = True
+                        self.parent.dirty_shape = True
             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
-
-        # Resolve constraints now that size is finalized
-        if self.dirty_constraints:
-            self.resolve_constraints()  # Finalize positioning based on final size
-            self.dirty_constraints = False
 
+        if self.dirty_position_constraints:
+            self.resolve_constraints(position_only=True)
 
-        # Step 3: Paint the surface if flagged as dirty
-        if self.dirty_surface:
+        if self.dirty_surface and not skip_draw:
             self.paint()
             self.dirty_surface = False
-    
 
 
     def draw(self, camera: bf.Camera) -> None:
-        self.apply_updates()
         # Draw widget and handle clipping if necessary
         super().draw(camera)
 
         if self.clip_children:
-            new_clip = camera.world_to_screen(self.get_padded_rect())
+            new_clip = camera.world_to_screen(self.get_inner_rect())
             old_clip = camera.surface.get_clip()
             new_clip = new_clip.clip(old_clip)
             camera.surface.set_clip(new_clip)
 
         # Draw each child widget, sorted by render order
         for child in sorted(self.children, key=lambda c: c.render_order):
-            child.draw(camera)
-
+            if (not self.clip_children) or (child.rect.colliderect(self.rect) or not child.rect):
+                child.draw(camera)
         if self.clip_children:
             camera.surface.set_clip(old_clip)

batFramework/manager.py

@@ -3,7 +3,7 @@ import pygame
 import asyncio
 
 class Manager(bf.SceneManager):
-    def __init__(self, *initial_scene_list) -> None:
+    def __init__(self, *initial_scenes) -> None:
         super().__init__()
         self.debug_mode: bf.enums.debugMode = bf.debugMode.HIDDEN
         self.screen: pygame.Surface | None = bf.const.SCREEN
@@ -18,8 +18,8 @@ class Manager(bf.SceneManager):
         bf.ResourceManager().set_sharedVar("debug_mode", self.debug_mode)
         
         self.do_pre_init()
-        if initial_scene_list:
-            self.init_scenes(*initial_scene_list)
+        if initial_scenes:
+            self.init_scenes(*initial_scenes)
         self.do_init()
 
     @staticmethod
@@ -75,15 +75,15 @@ class Manager(bf.SceneManager):
                 self.print_status()
                 return
         self.cutsceneManager.process_event(event)
+        if event.type == pygame.VIDEORESIZE and not (bf.const.FLAGS & pygame.SCALED):
+            bf.const.set_resolution((event.w, event.h))
+
         if event.consumed: return
+        
         super().process_event(event)
         if not event.consumed:
             if event.type == pygame.QUIT:
                 self.running = False
-            elif event.type == pygame.VIDEORESIZE and not (
-                bf.const.FLAGS & pygame.SCALED
-            ):
-                bf.const.set_resolution((event.w, event.h))
 
     def update(self, dt: float) -> None:
         self.timeManager.update(dt)
@@ -96,7 +96,6 @@ class Manager(bf.SceneManager):
             raise Exception("Manager can't start without scenes")
         if self.running:
             raise Exception("Error : Already running")
-            return
         self.is_async_running = True
         self.running = True
         dt: float = 0

batFramework/particle.py

@@ -82,6 +82,7 @@ class ParticleGenerator(bf.Drawable):
     def __init__(self) -> None:
         super().__init__((0, 0))
         self.particles: list[Particle] = []
+        self.count = 0
 
     def get_debug_outlines(self):
         return
@@ -96,10 +97,11 @@ class ParticleGenerator(bf.Drawable):
         particle.generator = self
         particle.do_when_added()
         self.particles.append(particle)
+        self.count += 1
 
     def clear(self):
         self.particles = []
-
+        self.count = 0
     def update(self, dt: float):
         particles_to_remove = []
         for particle in self.particles:
@@ -108,6 +110,7 @@ class ParticleGenerator(bf.Drawable):
                 particles_to_remove.append(particle)
         for p in particles_to_remove:
             self.particles.remove(p)
+            self.count -= 1
 
     def draw(self, camera) -> None:
         camera.surface.fblits(