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

batFramework/gui/layout.py

@@ -4,6 +4,7 @@ from .constraints.constraints import *
 from typing import Self, TYPE_CHECKING
 from abc import ABC,abstractmethod
 import pygame
+from .interactiveWidget import InteractiveWidget
 
 if TYPE_CHECKING:
     from .container import Container
@@ -15,8 +16,15 @@ class Layout(ABC):
         self.child_constraints: list[Constraint] = []
         self.children_rect = pygame.FRect(0, 0, 0, 0)
 
+    def get_free_space(self)->tuple[float,float]:
+        """
+        return the space available for Growing widgets to use
+        """
+        return self.parent.get_inner_rect()
+
     def set_child_constraints(self, *constraints) -> Self:
         self.child_constraints = list(constraints)
+        self.update_child_constraints()
         self.notify_parent()
         return self
 
@@ -28,14 +36,35 @@ class Layout(ABC):
         if self.parent:
             self.parent.dirty_layout = True
 
+    def update_children_rect(self):
+        if self.parent.get_layout_children():
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft,*self.parent.get_layout_children()[0].get_min_required_size())
+            
+            self.children_rect.unionall(
+                [pygame.FRect(0,0,*c.get_min_required_size()) for c in self.parent.get_layout_children()[1:]]
+            )
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, 0, 0)
+        self.children_rect.move_ip(-self.parent.scroll.x,-self.parent.scroll.y)
+
+    def update_child_constraints(self):
+        if self.parent:
+            for child in self.parent.get_layout_children():
+                child.add_constraints(*self.child_constraints)
+
     def arrange(self) -> None:
+        """
+        updates the position of children in the parent
+        """
         return
 
-    def get_raw_size(self) -> tuple[float, float]:
+    def get_raw_size(self):
         """
-        Returns the supposed size the container should have to encapsulate perfectly all of its widgets
+        Returns the size the container should have to encapsulate perfectly all of its widgets
         """
-        return self.parent.rect.size if self.parent else (0, 0)
+        # print(self,self.parent,len(self.parent.get_layout_children()))
+        self.update_children_rect()
+        return self.children_rect.size
 
     def get_auto_size(self) -> tuple[float, float]:
         """
@@ -43,342 +72,229 @@ class Layout(ABC):
         """
         target_size = list(self.get_raw_size())
         if not self.parent.autoresize_w:
-            target_size[0] = self.parent.rect.w
+            target_size[0] = self.parent.get_inner_width()
         if not self.parent.autoresize_h:
-            target_size[1] = self.parent.rect.h
-        return target_size
+            target_size[1] = self.parent.get_inner_height()
+        
+        return self.parent.expand_rect_with_padding((0,0,*target_size)).size 
+        # return target_size
+
+    def scroll_to_widget(self, widget: "Widget"):
+        """
+        Scrolls parent containers so that the widget becomes visible.
+        Handles deeply nested widgets and large widgets gracefully.
+        """
+        target = widget
+        container = self.parent
+
+        while container and not container.is_root:
+            target_rect = target.rect  # global
+            padded_rect = container.get_inner_rect()  # global
+
+            dx = dy = 0
+
+            # --- Horizontal ---
+            if target_rect.width <= padded_rect.width:
+                if target_rect.left < padded_rect.left:
+                    dx = target_rect.left - padded_rect.left
+                elif target_rect.right > padded_rect.right:
+                    dx = target_rect.right - padded_rect.right
+            else:
+                # Widget is wider than viewport: align left side
+                if target_rect.left < padded_rect.left:
+                    dx = target_rect.left - padded_rect.left
+                elif target_rect.right > padded_rect.right:
+                    dx = target_rect.right - padded_rect.right
+
+            # --- Vertical ---
+            if target_rect.height <= padded_rect.height:
+                if target_rect.top < padded_rect.top:
+                    dy = target_rect.top - padded_rect.top
+                elif target_rect.bottom > padded_rect.bottom:
+                    dy = target_rect.bottom - padded_rect.bottom
+            else:
+                # Widget is taller than viewport: align top side
+                if target_rect.top < padded_rect.top:
+                    dy = target_rect.top - padded_rect.top
+                elif target_rect.bottom > padded_rect.bottom:
+                    dy = target_rect.bottom - padded_rect.bottom
+
+            # Convert global delta into local scroll delta for container
+            container.scroll_by((dx, dy))
+
+            # Now the target for the next iteration is the container itself
+            target = container
+            container = container.parent
 
-    def scroll_to_widget(self, widget: Widget) -> None:
-        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)
-        # 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 FreeLayout(Layout):...
+
 class SingleAxisLayout(Layout):
+
+    def __init__(self, parent = None):
+        super().__init__(parent)
+
     def focus_next_child(self) -> None:
         l = self.parent.get_interactive_children()
         self.parent.focused_index = min(self.parent.focused_index + 1, len(l) - 1)
         focused = l[self.parent.focused_index]
         focused.get_focus()
-        self.scroll_to_widget(focused)
 
     def focus_prev_child(self) -> None:
         l = self.parent.get_interactive_children()
         self.parent.focused_index = max(self.parent.focused_index - 1, 0)
         focused = l[self.parent.focused_index]
         focused.get_focus()
-        self.scroll_to_widget(focused)
 
 
+class DoubleAxisLayout(Layout):
+    """Abstract layout class for layouts that arrange widgets in two dimensions."""
+
+    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 Column(SingleAxisLayout):
-    def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
+    def __init__(self, gap: int = 0):
         super().__init__()
         self.gap = gap
-        self.spacing = spacing
 
-    def set_gap(self, value: float) -> Self:
-        self.gap = value
-        self.notify_parent()
-        return self
+    def update_children_rect(self):
+        if self.parent.get_layout_children():
+            width = max(child.get_min_required_size()[0] for child in self.parent.get_layout_children() )
+            height = sum(child.get_min_required_size()[1] for child in self.parent.get_layout_children()) + self.gap * (len(self.parent.get_layout_children()) - 1)
 
-    def set_spacing(self, spacing: bf.spacing) -> Self:
-        self.spacing = spacing
-        self.notify_parent()
-        return self
-
-    def get_raw_size(self) -> tuple[float, float]:
-        len_children = len(self.parent.children)
-        if not len_children:
-            return self.parent.rect.size
-        parent_height = sum(c.get_min_required_size()[1] for c in self.parent.children)
-        parent_width = max(c.get_min_required_size()[0] for c in self.parent.children)
-        if self.gap:
-            parent_height += (len_children - 1) * self.gap
-        target_rect = self.parent.inflate_rect_by_padding(
-            (0, 0, parent_width, parent_height)
-        )
-        return target_rect.size
-
-    def get_auto_size(self) -> tuple[float, float]:
-        target_size = list(self.get_raw_size())
-        if not self.parent.autoresize_w:
-            target_size[0] = self.parent.rect.w
-        if not self.parent.autoresize_h:
-            target_size[1] = self.parent.rect.h
-        return target_size
+            # width = max(child.rect.w for child in self.parent.get_layout_children() )
+            # height = sum(child.rect.h for child in self.parent.get_layout_children()) + self.gap * (len(self.parent.get_layout_children()) - 1)
 
-    def arrange(self) -> None:
-        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()
 
-        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.children_rect.x, y)
-            y += child.get_min_required_size()[1] + self.gap
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, width, height)
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, 10, 10)
+        self.children_rect.move_ip(-self.parent.scroll.x,-self.parent.scroll.y)
 
     def handle_event(self, event):
-        if not self.parent.children:
+        if not self.parent.get_layout_children() or not self.parent.children_has_focus():
             return
 
         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
-
-            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
+            if event.key in (pygame.K_DOWN, pygame.K_UP):
+                self.focus_next_child() if event.key == pygame.K_DOWN else self.focus_prev_child()
+                event.consumed = True
+                event.consumed = True
+
+
+    def arrange(self) -> None:
+        self.update_children_rect()
+        y = self.children_rect.y
+        for child in self.parent.get_layout_children():
+            child.set_position(self.children_rect.x, y)
+            y += child.rect.height + self.gap
 
 class Row(SingleAxisLayout):
-    def __init__(self, gap: int = 0, spacing: bf.spacing = bf.spacing.MANUAL):
+    def __init__(self, gap: int = 0):
         super().__init__()
         self.gap = gap
-        self.spacing = spacing
 
-    def set_gap(self, value: float) -> Self:
-        self.gap = value
-        self.notify_parent()
-        return self
-
-    def set_spacing(self, spacing: bf.spacing) -> Self:
-        self.spacing = spacing
-        self.notify_parent()
-        return self
-
-    def get_raw_size(self) -> tuple[float, float]:
-        len_children = len(self.parent.children)
-        if not len_children:
-            return self.parent.rect.size
-        parent_width = sum(c.get_min_required_size()[0] for c in self.parent.children)
-        parent_height = max(c.get_min_required_size()[1] for c in self.parent.children)
-        if self.gap:
-            parent_width += (len_children - 1) * self.gap
-        target_rect = self.parent.inflate_rect_by_padding(
-            (0, 0, parent_width, parent_height)
-        )
-
-        return target_rect.size
-
-    def get_auto_size(self) -> tuple[float, float]:
-        target_size = list(self.get_raw_size())
-        if not self.parent.autoresize_w:
-            target_size[0] = self.parent.rect.w
-        if not self.parent.autoresize_h:
-            target_size[1] = self.parent.rect.h
-        return target_size
-
-    def arrange(self) -> None:
-        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)
-        x = self.children_rect.left
-        for child in self.parent.children:
-            child.set_position(x, self.children_rect.y)
-            x += child.get_min_required_size()[0] + self.gap
+    def update_children_rect(self):
+        if self.parent.get_layout_children():
+            height = max(child.get_min_required_size()[1] for child in self.parent.get_layout_children())
+            width = sum(child.get_min_required_size()[0] for child in self.parent.get_layout_children()) + self.gap * (len(self.parent.get_layout_children()) - 1)
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, width, height)
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, 10,10)        
+        self.children_rect.move_ip(-self.parent.scroll.x,-self.parent.scroll.y)
 
     def handle_event(self, event):
-        if not self.parent.children:
+        if not self.parent.get_layout_children() or not self.parent.children_has_focus():
             return
 
         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
-            if self.parent.rect.collidepoint(
-                r.drawing_camera.screen_to_world(pygame.mouse.get_pos())
-            ):
-                if event.button == 4:
-                    self.parent.scroll_by((-10, 0))
-                elif event.button == 5:
-                    self.parent.scroll_by((10, 0))
-                else:
-                    return
-                self.parent.clamp_scroll()
-            else:
-                return
-        else:
-            return
+            if event.key in (pygame.K_RIGHT, pygame.K_LEFT):
+                self.focus_next_child() if event.key == pygame.K_RIGHT else self.focus_prev_child()
+                event.consumed = True
 
 
-        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_w :
-           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()
+        self.update_children_rect()
+        x = self.children_rect.x
+        for child in self.parent.get_layout_children():
+            child.set_position(x,self.children_rect.y)
+            x += child.rect.width + self.gap
 
-        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 RowFill(Row):
 
+    def update_children_rect(self):
+        parent_width = self.parent.get_inner_width()
+        if self.parent.get_layout_children():
+            height = max(child.get_min_required_size()[1] for child in self.parent.get_layout_children())
+            width = parent_width
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, width, height)
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, parent_width,10)        
+        self.children_rect.move_ip(-self.parent.scroll.x,-self.parent.scroll.y)
 
-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)
+        """
+        Arranges children in a row and resizes them to fill the parent's height,
+        accounting for the gap between children.
+        """
+        self.update_children_rect()
+        for child in self.parent.get_layout_children():
+            child.set_autoresize_w(False)
+        x = self.children_rect.x
+        # available_height = self.children_rect.height
 
-        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
+        # Calculate the width available for each child
+        total_gap = self.gap * (len(self.parent.get_layout_children()) - 1)
+        available_width = max(0, self.children_rect.width - total_gap)
+        child_width = available_width / len(self.parent.get_layout_children()) if self.parent.get_layout_children() else 0
 
-    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
+        for child in self.parent.get_layout_children():
+            child.set_size((child_width, None))  # Resize child to fill height
+            child.set_position(x, self.children_rect.y)  # Position child
+            x += child_width + self.gap
 
 
+class ColumnFill(Column):
 
-class DoubleAxisLayout(Layout):
-    """Abstract layout class for layouts that arrange widgets in two dimensions."""
+    def update_children_rect(self):
+        parent_height = self.parent.get_inner_height()
+        if self.parent.get_layout_children():
+            width = max(child.get_min_required_size()[0] for child in self.parent.get_layout_children())
+            height = parent_height
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, width, height)
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, 10, parent_height)
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
 
-    @abstractmethod
     def arrange(self) -> None:
-        """Arrange child widgets across both axes, implementation required in subclasses."""
-        pass
+        """
+        Arranges children in a column and resizes them to fill the parent's width,
+        accounting for the gap between children.
+        """
+        self.update_children_rect()
+        for child in self.parent.get_layout_children():
+            child.set_autoresize_h(False)
+        y = self.children_rect.y
 
-    def focus_up_child(self) -> None:...
-    def focus_down_child(self) -> None:...
-    def focus_right_child(self) -> None:...
-    def focus_left_child(self) -> None:...
+        # Calculate the height available for each child
+        total_gap = self.gap * (len(self.parent.get_layout_children()) - 1)
+        available_height = max(0, self.children_rect.height - total_gap)
+        child_height = available_height / len(self.parent.get_layout_children()) if self.parent.get_layout_children() else 0
 
+        for child in self.parent.get_layout_children():
+            child.set_size((None, child_height))  # Resize child to fill width
+            child.set_position(self.children_rect.x, y)  # Position child
+            y += child_height + self.gap
 
 
 class Grid(DoubleAxisLayout):
@@ -388,198 +304,123 @@ class Grid(DoubleAxisLayout):
         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:
+    def focus_up_child(self) -> None:
+        l = self.parent.get_interactive_children()
+        if not l:
             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:
+        current_index = self.parent.focused_index
+        if current_index == -1:
             return
-        event.consumed = True
+        current_row = current_index // self.cols
+        target_index = max(0, current_index - self.cols)
+        if target_index // self.cols < current_row:
+            self.parent.focused_index = target_index
+            l[target_index].get_focus()
 
     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):
+        if not 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:
+        current_index = self.parent.focused_index
+        if current_index == -1:
             return
-        self.parent.focused_index = new_index
-        focused = l[self.parent.focused_index]
-        focused.get_focus()
-        self.scroll_to_widget(focused)
+        current_row = current_index // self.cols
+        target_index = min(len(l) - 1, current_index + self.cols)
+        if target_index // self.cols > current_row:
+            self.parent.focused_index = target_index
+            l[target_index].get_focus()
 
     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:
+        if not l:
             return
-        self.parent.focused_index -=1
-        focused = l[self.parent.focused_index]
-        focused.get_focus()
-        self.scroll_to_widget(focused)
+        current_index = self.parent.focused_index
+        if current_index == -1:
+            return
+        target_index = max(0, current_index - 1)
+        if target_index // self.cols == current_index // self.cols:
+            self.parent.focused_index = target_index
+            l[target_index].get_focus()
 
     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):
+        if not l:
             return
-        self.parent.focused_index += 1
-        focused = l[self.parent.focused_index]
-        focused.get_focus()
-        self.scroll_to_widget(focused)
+        current_index = self.parent.focused_index
+        if current_index == -1:
+            return
+        target_index = min(len(l) - 1, current_index + 1)
+        if target_index // self.cols == current_index // self.cols:
+            self.parent.focused_index = target_index
+            l[target_index].get_focus()
 
+    def handle_event(self, event):
+        if not self.parent.get_layout_children() or not self.parent.children_has_focus():
+            return
 
-class GridFill(Grid):
-    def __init__(self, rows: int, cols: int, gap: int = 0):
-        super().__init__(rows,cols,gap)
+        if event.type == pygame.KEYDOWN:
+            if event.key in (pygame.K_RIGHT, pygame.K_LEFT, pygame.K_UP, pygame.K_DOWN):
+                if event.key == pygame.K_RIGHT:
+                    self.focus_right_child()
+                elif event.key == pygame.K_LEFT:
+                    self.focus_left_child()
+                elif event.key == pygame.K_UP:
+                    self.focus_up_child()
+                elif event.key == pygame.K_DOWN:
+                    self.focus_down_child()
+                
+                event.consumed = True
+
+    def update_children_rect(self):
+        if self.parent.get_layout_children():
+            cell_width = max(child.get_min_required_size()[0] for child in self.parent.get_layout_children())
+            cell_height = max(child.get_min_required_size()[1] for child in self.parent.get_layout_children())
+            width = self.cols * cell_width + self.gap * (self.cols - 1)
+            height = self.rows * cell_height + self.gap * (self.rows - 1)
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, width, height)
+        else:
+            self.children_rect = pygame.FRect(*self.parent.get_inner_rect().topleft, 10, 10)
+        self.children_rect.move_ip(-self.parent.scroll.x, -self.parent.scroll.y)
 
     def arrange(self) -> None:
-        """Arrange widgets to fill each grid cell, adjusting to available space."""
-        if not self.parent or not self.parent.children:
+        self.update_children_rect()
+        if not self.parent.get_layout_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)
+        cell_width = (self.children_rect.width - self.gap * (self.cols - 1)) / self.cols
+        cell_height = (self.children_rect.height - self.gap * (self.rows - 1)) / self.rows
 
-            child.set_position(x, y)
-            child.set_autoresize_w(False)
-            child.set_autoresize_h(False)
+        for i, child in enumerate(self.parent.get_layout_children()):
+            row = i // self.cols
+            col = i % self.cols
+            x = self.children_rect.x + col * (cell_width + self.gap)
+            y = self.children_rect.y + row * (cell_height + self.gap)
             child.set_size((cell_width, cell_height))
+            child.set_position(x, y)
 
-    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)
+class GridFill(Grid):
+    def update_children_rect(self):
+        self.children_rect = self.parent.get_inner_rect()
+    def arrange(self) -> None:
+        """
+        Arranges children in a grid and resizes them to fill the parent's available space,
+        accounting for the gap between children.
+        """
+        self.update_children_rect()
+            
+        if not self.parent.get_layout_children():
+            return
+        for child in self.parent.get_layout_children():
+            child.set_autoresize(False)
 
-        # 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
+        cell_width = (self.children_rect.width - self.gap * (self.cols - 1)) / self.cols
+        cell_height = (self.children_rect.height - self.gap * (self.rows - 1)) / self.rows
 
-        # Adjust for padding and return
-        target_rect = self.parent.inflate_rect_by_padding((0, 0, grid_width, grid_height))
-        return target_rect.size
+        for i, child in enumerate(self.parent.get_layout_children()):
+            row = i // self.cols
+            col = i % self.cols
+            x = self.children_rect.x + col * (cell_width + self.gap)
+            y = self.children_rect.y + row * (cell_height + self.gap)
+            child.set_size((cell_width, cell_height))
+            child.set_position(x, y)