From 306e59ce07ef45b50c2150fd9aeaa06c1fea707c Mon Sep 17 00:00:00 2001
From: Kristofers Solo <kristians.cagulis@pm.me>
Date: Thu, 4 Jan 2024 00:30:41 +0200
Subject: [PATCH] feat(utils): add `Size` and `Position`

---
 src/utils/__init__.py |  4 ++--
 src/utils/config.py   | 43 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index 25916c7..1f222f8 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -1,5 +1,5 @@
-from .config import CONFIG
+from .config import CONFIG, Position, Size
 from .log import log
 from .path import BASE_PATH
 
-__all__ = ["BASE_PATH", "CONFIG", "log"]
+__all__ = ["BASE_PATH", "CONFIG", "log", "Size", "Position"]
diff --git a/src/utils/config.py b/src/utils/config.py
index 68c2dc2..3122272 100644
--- a/src/utils/config.py
+++ b/src/utils/config.py
@@ -1,34 +1,63 @@
-from typing import NamedTuple
+from typing import NamedTuple, Union
 
-from attr import define
+from attr import define, field
 
 from .colors import TokyoNightNight
 
+PADDING = 20
+
 
 class Size(NamedTuple):
-    width: int
-    height: int
+    width: int | float
+    height: int | float
+
+    def add(self, other: Union["Size", int, float]) -> "Size":
+        if isinstance(other, Size):
+            return Size(self.width + other.width, self.height + other.height)
+        return Size(self.width + other, self.height + other)
+
+    def sub(self, other: Union["Size", int, float]) -> "Size":
+        if isinstance(other, Size):
+            return Size(self.width - other.width, self.height - other.height)
+        return Size(self.width - other, self.height - other)
+
+
+class Position(NamedTuple):
+    x: int | float
+    y: int | float
+
+    def add(self, other: Union["Position", int, float]) -> "Position":
+        if isinstance(other, Position):
+            return Position(self.x + other.x, self.y + other.y)
+        return Position(self.x + other, self.y + other)
+
+    def sub(self, other: Union["Position", int, float]) -> "Position":
+        if isinstance(other, Position):
+            return Position(self.x - other.x, self.y - other.y)
+        return Position(self.x - other, self.y - other)
 
 
 @define
 class Game:
     columns: int = 10
     rows: int = 20
+    padding: int = PADDING
     cell_size: int = 40
     size: Size = Size(columns * cell_size, rows * cell_size)
+    pos: Position = Position(padding, padding)
 
 
 @define
 class SideBar:
     size: Size = Size(200, Game().size.height)
-    preview_height_fraction: float = 0.7
-    score_height_fraction: float = 1 - preview_height_fraction
+    score: Size = Size(size.width, size.height * 0.3)
+    preview: Size = Size(size.width, size.height * 0.7)
 
 
 @define
 class Window:
     title = "Tetris"
-    padding: int = 20
+    padding: int = PADDING
     size: Size = Size(
         Game().size.width + SideBar().size.width + padding * 3,
         Game().size.height + padding * 2,