hbox container + grid start

diff --git a/container.py b/container.py
index 0d172b5f24fe60d06fc6564813d59f0a855dfaa7..2bea335ffde2553d046771756f5ab8f57575c65c 100644 (file)
--- a/container.py
+++ b/container.py
@@ -2,7 +2,7 @@ from color import Color
 from rectangle import Rectangle
 
 
-class Container:
+class VBoxContainer:
     def __init__(self, x, y, background_color=Color.WHITE, border_color=Color.BLACK, border_width=0,
                  border_radius=0, padding=10, separation_distance=20, centered=False, children=None):
         if children is None:
@@ -47,7 +47,8 @@ class Container:
     def update_children_position(self):
         child_y = self.y
         for i, child in enumerate(self.children):
-            child_position_x = self.x + (self.width - 2 * self.padding - child.get_width()) // 2 if self.centered else self.x
+            child_position_x = self.x + (
+                    self.width - 2 * self.padding - child.get_width()) // 2 if self.centered else self.x
             child_position_y = child_y
             if hasattr(child, 'padding'):
                 child_position_x += self.padding
@@ -80,7 +81,8 @@ class Container:
             self.height = 0
         else:
             self.width = max([child.get_width() for child in self.children]) + self.padding * 2
-            self.height = sum([child.get_height() for child in self.children]) + self.padding * 2 + (self.get_child_count() - 1) * self.separation_distance
+            self.height = sum([child.get_height() for child in self.children]) + self.padding * 2 + (
+                    self.get_child_count() - 1) * self.separation_distance
         self.rect.set_size(self.width, self.height)
 
     def add_child(self, child):
@@ -97,3 +99,207 @@ class Container:
         self.rect.draw(screen)
         for child in self.children:
             child.draw(screen)
+
+
+class HBoxContainer:
+    def __init__(self, x, y, background_color=Color.WHITE, border_color=Color.BLACK, border_width=0,
+                 border_radius=0, padding=10, separation_distance=20, centered=True, children=None):
+        if children is None:
+            children = []
+        self.x = x
+        self.y = y
+        self.width = 0
+        self.height = 0
+        self.background_color = background_color
+        self.border_color = border_color
+        self.border_width = border_width
+        self.border_radius = border_radius
+        self.padding = padding
+        self.separation_distance = separation_distance
+        self.centered = centered
+
+        self.rect = Rectangle(self.x - self.padding, self.y - self.padding, self.width, self.height,
+                              self.background_color, self.border_color, self.border_width, self.border_radius)
+
+        self.children = children
+        self.set_size()
+        self.update_children_position()
+
+    def get_children(self):
+        return self.children
+
+    def get_child(self, index):
+        return self.children[index]
+
+    def get_child_count(self):
+        return len(self.children)
+
+    def get_child_index(self, child):
+        return self.children.index(child)
+
+    def set_position(self, x, y):
+        self.x = x
+        self.y = y
+        self.rect.set_position(x - self.padding, y - self.padding)
+        self.update_children_position()
+
+    def update_children_position(self):
+        child_x = self.x
+        for i, child in enumerate(self.children):
+            child_position_x = child_x
+            child_position_y = self.y + (
+                        self.height - 2 * self.padding - child.get_height()) // 2 if self.centered else self.x
+
+            if hasattr(child, 'padding'):
+                child_position_x += self.padding
+                child_position_y += self.padding
+
+            child.set_position(child_position_x, child_position_y)
+            child_x += child.get_width() + self.separation_distance
+
+    def update(self):
+        for child in self.children:
+            if hasattr(child, 'update'):
+                child.update()
+
+    def get_width(self):
+        return self.width
+
+    def get_height(self):
+        return self.height
+
+    def move(self, dx, dy):
+        self.x += dx
+        self.y += dy
+        self.rect.move(dx, dy)
+        for child in self.children:
+            child.move(dx, dy)
+
+    def set_size(self):
+        if self.get_child_count() == 0:
+            self.width = 0
+            self.height = 0
+        else:
+            self.width = sum([child.get_width() for child in self.children]) + self.padding * 2 + (
+                    self.get_child_count() - 1) * self.separation_distance
+            self.height = max([child.get_height() for child in self.children]) + self.padding * 2
+        self.rect.set_size(self.width, self.height)
+
+    def add_child(self, child):
+        self.children.append(child)
+        self.set_size()
+        self.update_children_position()
+
+    def remove_child(self, child):
+        self.children.remove(child)
+        self.set_size()
+        self.update_children_position()
+
+    def draw(self, screen):
+        self.rect.draw(screen)
+        for child in self.children:
+            child.draw(screen)
+
+
+class GridContainer:
+
+    def __init__(self, x, y, rows, columns, background_color=Color.WHITE, border_color=Color.BLACK, border_width=0,
+                 border_radius=0, padding=10, separation_distance=20, children=None):
+        if children is None:
+            children = [[None for _ in range(columns)] for _ in range(rows)]
+        else:
+
+            if len(children) != rows:
+                raise ValueError('Children must be a 2D array of size rows x columns')
+            for row in children:
+                if len(row) != columns:
+                    raise ValueError('Children must be a 2D array of size rows x columns')
+        self.rows = rows
+        self.columns = columns
+        grid = VBoxContainer(x, y, background_color, border_color, border_width, border_radius, padding,
+                             separation_distance, True)
+        for row in children:
+            grid.add_child(HBoxContainer(x, y, background_color, border_color, border_width, border_radius, padding,
+                                         separation_distance, True, row))
+        self.children = children
+
+    def get_children(self):
+        return self.children
+
+    def get_child(self, row, col):
+        return self.children[row][col]
+
+    def get_child_count(self):
+        counter = 0
+        for row in self.children:
+            counter += len(row)
+        return counter
+
+    def get_child_index(self, child):
+        for row in self.children:
+            if child in row:
+                return self.children.index(child)
+        return -1
+
+    def set_position(self, x, y):
+        self.x = x
+        self.y = y
+        self.rect.set_position(x - self.padding, y - self.padding)
+        self.update_children_position()
+
+    def update_children_position(self):
+        child_x = self.x
+        for i, child in enumerate(self.children):
+            child_position_x = child_x
+            child_position_y = self.y + (
+                        self.height - 2 * self.padding - child.get_height()) // 2 if self.centered else self.x
+
+            if hasattr(child, 'padding'):
+                child_position_x += self.padding
+                child_position_y += self.padding
+
+            child.set_position(child_position_x, child_position_y)
+            child_x += child.get_width() + self.separation_distance
+
+    def update(self):
+        for child in self.children:
+            if hasattr(child, 'update'):
+                child.update()
+
+    def get_width(self):
+        return self.width
+
+    def get_height(self):
+        return self.height
+
+    def move(self, dx, dy):
+        self.x += dx
+        self.y += dy
+        self.rect.move(dx, dy)
+        for child in self.children:
+            child.move(dx, dy)
+
+    def set_size(self):
+        if self.get_child_count() == 0:
+            self.width = 0
+            self.height = 0
+        else:
+            self.width = sum([child.get_width() for child in self.children]) + self.padding * 2 + (
+                    self.get_child_count() - 1) * self.separation_distance
+            self.height = max([child.get_height() for child in self.children]) + self.padding * 2
+        self.rect.set_size(self.width, self.height)
+
+    def add_child(self, child, row, col):
+        self.children[row][col] = child
+        self.set_size()
+        self.update_children_position()
+
+    def remove_child(self, child):
+        self.children.remove(child)
+        self.set_size()
+        self.update_children_position()
+
+    def draw(self, screen):
+        self.rect.draw(screen)
+        for child in self.children:
+            child.draw(screen)

diff --git a/main.py b/main.py
index 3ae413d8cea4a6736bab350dbc1ffcf1eb44a034..dbd321b150b96656a88018be4f9d8c708ce21e54 100644 (file)
--- a/main.py
+++ b/main.py
@@ -3,7 +3,7 @@ from color import Color
 from rectangle import Rectangle
 from text import Text, Label
 from button import Button
-from container import Container
+from container import VBoxContainer, HBoxContainer
 from image import Image
 
 
@@ -22,11 +22,12 @@ d = Button(100, 200, "Play", "Imprint Shadow", 40, Color.BLUE, Color.BLACK, Colo
            lambda: print("Hello World"))
 e = Button(100, 300, "Quit", "Imprint Shadow", 40, Color.BLUE, Color.BLACK, Color.BLACK, 1, 15, 20,
            lambda: print("Goodbye World"))
-f = Container(400, 100, Color.WHITE, Color.BLACK, 1, 15, 20, 50, True, [d, e])
+f = HBoxContainer(400, 25, Color.WHITE, Color.BLACK, 1, 15, 20, 10, True, [d, e])
 f.add_child(a)
 
-g = Image(0, -400, "image.PNG", Color.BLACK, 1)
-g.resize(600, 400)
+g = Image(0, 0, "image.PNG", Color.BLACK, 5)
+g.resize(200, 200)
+f.add_child(c)
 
 is_running = True
 while is_running:
@@ -38,7 +39,7 @@ while is_running:
 
     a.draw(screen)
     b.move(delta * 10, delta * 10)
-    b.set_text("Word hunt " + str(round(clock.get_fps())) + " FPS")
+    b.set_text(str(round(clock.get_fps())) + " FPS")
     b.draw(screen)
     c.draw(screen)
 
@@ -49,10 +50,10 @@ while is_running:
     e.draw(screen)
 
     f.update()
-    f.move(delta * -10, 0)
+    f.move(delta * -40, 0)
     f.draw(screen)
 
-    g.move(0, delta * 50)
+    g.move(0, delta * 25)
     g.draw(screen)
 
     pygame.display.update()