batframework 1.0.8a14__py3-none-any.whl → 1.0.9a2__py3-none-any.whl

batFramework/gui/layout.py

@@ -2,7 +2,7 @@ import batFramework as bf
 from .widget import Widget
 from .constraints.constraints import *
 from typing import Self, TYPE_CHECKING
-from abc import ABC
+from abc import ABC,abstractmethod
 import pygame
 
 if TYPE_CHECKING:
@@ -26,7 +26,7 @@ class Layout(ABC):
 
     def notify_parent(self) -> None:
         if self.parent:
-            self.parent.dirty_children = True
+            self.parent.dirty_layout = True
 
     def arrange(self) -> None:
         return
@@ -39,7 +39,7 @@ class Layout(ABC):
 
     def get_auto_size(self) -> tuple[float, float]:
         """
-        Returns the final size the container should have (while keeping the the width and height if they are non-resizable)
+        Returns the final size the container should have (while keeping the width and height if they are non-resizable)
         """
         target_size = list(self.get_raw_size())
         if not self.parent.autoresize_w:
@@ -48,25 +48,20 @@ class Layout(ABC):
             target_size[1] = self.parent.rect.h
         return target_size
 
-    def focus_next_child(self) -> None:
-        pass
-
-    def focus_prev_child(self) -> None:
-        pass
-
     def scroll_to_widget(self, widget: Widget) -> None:
-        padded = self.parent.get_padded_rect()
-        r = widget.rect
-        if padded.contains(r):
+        padded = self.parent.get_padded_rect() # le carré intérieur
+        r = widget.rect # le carré du widget = Button
+        if padded.contains(r): # le widget ne depasse pas -> OK
             return
         clamped = r.clamp(padded)
-        dx, dy = clamped.move(-r.x, -r.y).topleft
-        self.parent.scroll_by((-dx, -dy))
+        # clamped.move_ip(-self.parent.rect.x,-self.parent.rect.y)
+        dx,dy = clamped.x - r.x,clamped.y-r.y
 
+        self.parent.scroll_by((-dx, -dy)) # on scroll la différence pour afficher le bouton en entier
+        
     def handle_event(self, event):
         pass
 
-
 class SingleAxisLayout(Layout):
     def focus_next_child(self) -> None:
         l = self.parent.get_interactive_children()
@@ -83,6 +78,7 @@ class SingleAxisLayout(Layout):
         self.scroll_to_widget(focused)
 
 
+
 class Column(SingleAxisLayout):
     def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
         super().__init__()
@@ -126,29 +122,39 @@ class Column(SingleAxisLayout):
         if self.child_constraints:
             for child in self.parent.children:
                 child.add_constraints(*self.child_constraints)
-        self.child_rect = self.parent.get_padded_rect()
-
-        if self.parent.autoresize_w or self.parent.autoresize_h:
-            width, height = self.get_auto_size()
-            if self.parent.rect.size != (width, height):
-                self.parent.set_size((width, height))
-                self.parent.build()
-                self.arrange()
-                return
-        self.child_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
-        y = self.child_rect.top
+        self.children_rect = self.parent.get_padded_rect()
+
+        width, height = self.get_auto_size()
+        if self.parent.autoresize_w and self.parent.rect.w !=width:
+            self.parent.set_size((width,None))
+        if self.parent.autoresize_h and self.parent.rect.h !=height:
+            self.parent.set_size((None,height))
+        
+        # if self.parent.dirty_shape:
+            # print("parent set dirty shape")
+            # self.parent.dirty_layout = True
+            # self.parent.apply_updates()
+            # self.arrange()
+            # return
+            
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
+        y = self.children_rect.top
         for child in self.parent.children:
-            child.set_position(self.child_rect.x, y)
+            child.set_position(self.children_rect.x, y)
             y += child.get_min_required_size()[1] + self.gap
 
     def handle_event(self, event):
-        if self.parent.autoresize_h or not self.parent.visible:
-            return
-
         if not self.parent.children:
             return
 
-        if event.type == pygame.MOUSEBUTTONDOWN:
+        if event.type == pygame.KEYDOWN:
+            if event.key == pygame.K_DOWN:
+                self.focus_next_child()
+            elif event.key == pygame.K_UP:
+                self.focus_prev_child()
+            else:
+                return
+        elif event.type == pygame.MOUSEBUTTONDOWN:
             r = self.parent.get_root()
             if not r:
                 return
@@ -162,9 +168,12 @@ class Column(SingleAxisLayout):
                     self.parent.scroll_by((0, 10))
                 else:
                     return
-                event.consumed = True
                 self.parent.clamp_scroll()
-
+            else:
+                return
+        else:
+            return
+        event.consumed = True
 
 class Row(SingleAxisLayout):
     def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
@@ -210,7 +219,7 @@ class Row(SingleAxisLayout):
         if self.child_constraints:
             for child in self.parent.children:
                 child.add_constraints(*self.child_constraints)
-        self.child_rect = self.parent.get_padded_rect()
+        self.children_rect = self.parent.get_padded_rect()
 
         if self.parent.autoresize_w or self.parent.autoresize_h:
             width, height = self.get_auto_size()
@@ -219,20 +228,25 @@ class Row(SingleAxisLayout):
                 self.parent.build()
                 self.arrange()
                 return
-        self.child_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
-        x = self.child_rect.left
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
+        x = self.children_rect.left
         for child in self.parent.children:
-            child.set_position(x, self.child_rect.y)
+            child.set_position(x, self.children_rect.y)
             x += child.get_min_required_size()[0] + self.gap
 
     def handle_event(self, event):
-        if self.parent.autoresize_w or not self.parent.visible:
-            return
-
         if not self.parent.children:
             return
 
-        if event.type == pygame.MOUSEBUTTONDOWN:
+        if event.type == pygame.KEYDOWN:
+            if event.key == pygame.K_RIGHT:
+                self.focus_next_child()
+            elif event.key == pygame.K_LEFT:
+                self.focus_prev_child()
+            else:
+                return
+                
+        elif event.type == pygame.MOUSEBUTTONDOWN:
             r = self.parent.get_root()
             if not r:
                 return
@@ -245,5 +259,327 @@ class Row(SingleAxisLayout):
                     self.parent.scroll_by((10, 0))
                 else:
                     return
-                event.consumed = True
                 self.parent.clamp_scroll()
+            else:
+                return
+        else:
+            return
+
+
+        event.consumed = True
+
+class RowFill(Row):
+    def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
+        super().__init__(gap, spacing)
+
+    def arrange(self) -> None:
+        if self.parent.autoresize_h :
+           super().arrange() 
+           return
+        if not self.parent or not self.parent.children:
+            return
+
+        if self.child_constraints:
+            for child in self.parent.children:
+                child.add_constraints(*self.child_constraints)
+        self.children_rect = self.parent.get_padded_rect()
+
+        if self.parent.autoresize_w or self.parent.autoresize_h:
+            width, height = self.get_auto_size()
+            if self.parent.rect.size != (width, height):
+                self.parent.set_size((width, height))
+                self.parent.build()
+                self.arrange()
+                return
+
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
+        
+        # Calculate the width each child should fill
+        available_width = self.children_rect.width - (len(self.parent.children) - 1) * self.gap
+        child_width = available_width / len(self.parent.children)
+        
+        x = self.children_rect.left
+        for child in self.parent.children:
+            child.set_position(x, self.children_rect.y)
+            child.set_autoresize_w(False)
+            child.set_size((child_width, None))
+            x += child_width + self.gap
+
+    def get_raw_size(self) -> tuple[float, float]:
+        """Calculate total size with children widths filling the available space."""
+        if self.parent.autoresize_h :
+           return super().get_raw_size()
+        len_children = len(self.parent.children)
+        if not len_children:
+            return self.parent.rect.size
+        parent_height = max(c.get_min_required_size()[1] for c in self.parent.children)
+        target_rect = self.parent.inflate_rect_by_padding((0, 0, self.children_rect.width, parent_height))
+        return target_rect.size
+
+
+class ColumnFill(Column):
+    def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
+        super().__init__(gap, spacing)
+
+    def arrange(self) -> None:
+        if self.parent.autoresize_h :
+           super().arrange() 
+           return
+        if not self.parent or not self.parent.children:
+            return
+        if self.child_constraints:
+            for child in self.parent.children:
+                child.add_constraints(*self.child_constraints)
+        self.children_rect = self.parent.get_padded_rect()
+
+        if self.parent.autoresize_w or self.parent.autoresize_h:
+            width, height = self.get_auto_size()
+            if self.parent.rect.size != (width, height):
+                self.parent.set_size((width, height))
+                self.parent.build()
+                self.arrange()
+                return
+
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
+
+        # Calculate the height each child should fill
+        available_height = self.children_rect.height - (len(self.parent.children) - 1) * self.gap
+        child_height = available_height / len(self.parent.children)
+
+        y = self.children_rect.top
+        for child in self.parent.children:
+            child.set_position(self.children_rect.x, y)
+            child.set_autoresize_h(False)
+            child.set_size((None, child_height))
+            y += child_height + self.gap
+
+    def get_raw_size(self) -> tuple[float, float]:
+        """Calculate total size with children heights filling the available space."""
+        if self.parent.autoresize_w :
+           return super().get_raw_size()
+        len_children = len(self.parent.children)
+        if not len_children:
+            return self.parent.rect.size
+        parent_width = max(c.get_min_required_size()[0] for c in self.parent.children)
+        target_rect = self.parent.inflate_rect_by_padding((0, 0, parent_width, self.children_rect.height))
+        return target_rect.size
+
+
+
+class DoubleAxisLayout(Layout):
+    """Abstract layout class for layouts that arrange widgets in two dimensions."""
+
+    @abstractmethod
+    def arrange(self) -> None:
+        """Arrange child widgets across both axes, implementation required in subclasses."""
+        pass
+
+    def focus_up_child(self) -> None:...
+    def focus_down_child(self) -> None:...
+    def focus_right_child(self) -> None:...
+    def focus_left_child(self) -> None:...
+
+
+
+class Grid(DoubleAxisLayout):
+    def __init__(self, rows: int, cols: int, gap: int = 0):
+        super().__init__()
+        self.rows = rows
+        self.cols = cols
+        self.gap = gap
+
+    def set_gap(self, value: int) -> Self:
+        self.gap = value
+        self.notify_parent()
+        return self
+
+    def set_dimensions(self, rows: int, cols: int) -> Self:
+        self.rows = rows
+        self.cols = cols
+        self.notify_parent()
+        return self
+
+    def get_raw_size(self) -> tuple[float, float]:
+        """Calculate raw size based on the max width and height needed to fit all children."""
+        if not self.parent.children:
+            return self.parent.rect.size
+
+        # Calculate necessary width and height for the grid
+        max_child_width = max(child.get_min_required_size()[0] for child in self.parent.children)
+        max_child_height = max(child.get_min_required_size()[1] for child in self.parent.children)
+        
+        grid_width = self.cols * max_child_width + (self.cols - 1) * self.gap
+        grid_height = self.rows * max_child_height + (self.rows - 1) * self.gap
+        target_rect = self.parent.inflate_rect_by_padding((0, 0, grid_width, grid_height))
+        
+        return target_rect.size
+
+    def arrange(self) -> None:
+        """Arrange widgets in a grid with specified rows and columns."""
+        if not self.parent or not self.parent.children:
+            return
+
+        if self.child_constraints:
+            for child in self.parent.children:
+                child.add_constraints(*self.child_constraints)
+
+
+        if self.parent.autoresize_w or self.parent.autoresize_h:
+            width, height = self.get_auto_size()
+            if self.parent.rect.size != (width, height):
+                self.parent.set_size((width, height))
+                self.parent.build()
+                self.arrange()
+                return
+
+        self.child_rect = self.parent.get_padded_rect()
+
+        # Calculate cell width and height based on parent size and gaps
+        cell_width = (self.child_rect.width - (self.cols - 1) * self.gap) / self.cols
+        cell_height = (self.child_rect.height - (self.rows - 1) * self.gap) / self.rows
+
+        for i, child in enumerate(self.parent.children):
+            row = i // self.cols
+            col = i % self.cols
+            x = self.child_rect.left + col * (cell_width + self.gap)
+            y = self.child_rect.top + row * (cell_height + self.gap)
+
+            child.set_position(x, y)
+            child.set_size((cell_width, cell_height))
+
+    def handle_event(self, event):
+
+        if event.type == pygame.KEYDOWN:
+            if event.key == pygame.K_DOWN:
+                self.focus_down_child()
+            elif event.key == pygame.K_UP:
+                self.focus_up_child()
+            elif event.key == pygame.K_LEFT:
+                self.focus_left_child()
+            elif event.key == pygame.K_RIGHT:
+                self.focus_right_child()         
+            else:
+                return
+        elif event.type == pygame.MOUSEBUTTONDOWN:
+            r = self.parent.get_root()
+            if not r:
+                return
+
+            if self.parent.rect.collidepoint(
+                r.drawing_camera.screen_to_world(pygame.mouse.get_pos())
+            ):
+                if event.button == 4:
+                    self.parent.scroll_by((0, -10))
+                elif event.button == 5:
+                    self.parent.scroll_by((0, 10))
+                else:
+                    return
+                self.parent.clamp_scroll()
+            else:
+                return
+        else:
+            return
+        event.consumed = True
+
+    def focus_down_child(self) -> None:
+        l = self.parent.get_interactive_children()
+        new_index = self.parent.focused_index + self.cols
+        if new_index >= len(l):
+            return
+        self.parent.focused_index = new_index
+        focused = l[self.parent.focused_index]
+        focused.get_focus()
+        self.scroll_to_widget(focused)
+
+    def focus_up_child(self) -> None:
+        l = self.parent.get_interactive_children()
+        new_index = self.parent.focused_index - self.cols
+        if new_index < 0:
+            return
+        self.parent.focused_index = new_index
+        focused = l[self.parent.focused_index]
+        focused.get_focus()
+        self.scroll_to_widget(focused)
+
+    def focus_left_child(self) -> None:
+        l = self.parent.get_interactive_children()
+        new_index = (self.parent.focused_index % self.cols) -1
+        if new_index < 0:
+            return
+        self.parent.focused_index -=1
+        focused = l[self.parent.focused_index]
+        focused.get_focus()
+        self.scroll_to_widget(focused)
+
+    def focus_right_child(self) -> None:
+        l = self.parent.get_interactive_children()
+        new_index = (self.parent.focused_index % self.cols) +1
+        if new_index >= self.cols or self.parent.focused_index+1 >= len(l):
+            return
+        self.parent.focused_index += 1
+        focused = l[self.parent.focused_index]
+        focused.get_focus()
+        self.scroll_to_widget(focused)
+
+
+class GridFill(Grid):
+    def __init__(self, rows: int, cols: int, gap: int = 0):
+        super().__init__(rows,cols,gap)
+
+    def arrange(self) -> None:
+        """Arrange widgets to fill each grid cell, adjusting to available space."""
+        if not self.parent or not self.parent.children:
+            return
+
+        if self.child_constraints:
+            for child in self.parent.children:
+                child.add_constraints(*self.child_constraints)
+
+        self.child_rect = self.parent.get_padded_rect()
+
+        # If autoresize is enabled, calculate required dimensions
+        if self.parent.autoresize_w or self.parent.autoresize_h:
+            width, height = self.get_auto_size()
+            if self.parent.rect.size != (width, height):
+                self.parent.set_size((width, height))
+                self.parent.build()
+                self.arrange()
+                return
+
+        # Adjust for scrolling offset
+        self.child_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
+
+        # Calculate cell dimensions based on available space
+        available_width = self.child_rect.width - (self.cols - 1) * self.gap
+        available_height = self.child_rect.height - (self.rows - 1) * self.gap
+        cell_width = available_width / self.cols
+        cell_height = available_height / self.rows
+
+        # Position each child in the grid
+        for index, child in enumerate(self.parent.children):
+            row = index // self.cols
+            col = index % self.cols
+            x = self.child_rect.left + col * (cell_width + self.gap)
+            y = self.child_rect.top + row * (cell_height + self.gap)
+
+            child.set_position(x, y)
+            child.set_autoresize_w(False)
+            child.set_autoresize_h(False)
+            child.set_size((cell_width, cell_height))
+
+    def get_raw_size(self) -> tuple[float, float]:
+        """Calculate the grid’s raw size based on child minimums and the grid dimensions."""
+        if not self.parent.children:
+            return self.parent.rect.size
+
+        # Determine minimum cell size required by the largest child
+        max_child_width = max(child.get_min_required_size()[0] for child in self.parent.children)
+        max_child_height = max(child.get_min_required_size()[1] for child in self.parent.children)
+
+        # Calculate total required size for the grid
+        grid_width = self.cols * max_child_width + (self.cols - 1) * self.gap
+        grid_height = self.rows * max_child_height + (self.rows - 1) * self.gap
+
+        # Adjust for padding and return
+        target_rect = self.parent.inflate_rect_by_padding((0, 0, grid_width, grid_height))
+        return target_rect.size

batFramework/gui/root.py

@@ -70,10 +70,10 @@ class Root(InteractiveWidget):
         return res
 
     def focus_next_tab(self, widget):
-        return True
+        return
 
     def focus_prev_tab(self, widget):
-        return True
+        return
 
     def get_by_uid(self, uid: int) -> "Widget":
         def helper(w: "Widget", uid: int) -> "Widget":
@@ -91,7 +91,6 @@ class Root(InteractiveWidget):
         if not force:
             return self
         self.rect.size = size
-        # self.build(resolve_constraints=True)
         return self
 
     def do_handle_event(self, event):

batFramework/gui/shape.py

@@ -47,6 +47,8 @@ class Shape(Widget):
         self.relief = relief
         return self
 
+
+
     def set_texture(
         self, surface: pygame.SurfaceType, subsize: tuple[int, int] | None = None
     ) -> Self:

batFramework/gui/slider.py

@@ -198,6 +198,7 @@ class Slider(Button):
 
         if self.autoresize_h or self.autoresize_w:
             target_rect = self.inflate_rect_by_padding(joined_rect)
+            target_rect.h += self.unpressed_relief
             if not self.autoresize_w:
                 target_rect.w = self.rect.w
             if not self.autoresize_h: