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

batFramework/gui/clickableWidget.py

@@ -1,10 +1,8 @@
-from .label import Label
 import batFramework as bf
 from typing import Self, Callable, Any
 from .interactiveWidget import InteractiveWidget
 from .shape import Shape
 import pygame
-from math import ceil
 
 
 class ClickableWidget(Shape, InteractiveWidget):
@@ -27,17 +25,11 @@ class ClickableWidget(Shape, InteractiveWidget):
         self.set_debug_color("cyan")
         self.set_relief(self.unpressed_relief)
 
+
     def get_min_required_size(self) -> tuple[float, float]:
-        if not (self.autoresize_w or self.autoresize_h):
-            return self.rect.size
-        
         res = super().get_min_required_size()
         res = res[0],res[1]+self.unpressed_relief
-        print("hey",res)
-        return res[0] if self.autoresize_w else self.rect.w, (
-            res[1] if self.autoresize_h else self.rect.h
-        )
-
+        return res
 
     def set_unpressed_relief(self, relief: int) -> Self:
         if relief == self.unpressed_relief:
@@ -143,28 +135,50 @@ class ClickableWidget(Shape, InteractiveWidget):
 
     def click(self, force=False) -> None:
         if not self.enabled and not force:
-            return
+            return False
         if self.callback is not None:
             self.callback()
+            return True
+        return False
+
+    def on_key_down(self, key):
+        if key == pygame.K_SPACE:
+            self.on_click_down(1)
+            return True
+        return self.do_on_key_down(key)
+    
+    def on_key_up(self, key):
+        if key == pygame.K_SPACE:
+            self.on_click_up(1)
+            return True
+        return self.do_on_key_down(key)
+        
 
-    def do_on_click_down(self, button) -> None:
+    def on_click_down(self, button) -> None:
+        if super().on_click_down(button):
+            return True
         if self.enabled and button == 1:
             if not self.get_focus():
-                return
+                return False
             self.is_pressed = True
             if self.click_down_sound:
                 bf.AudioManager().play_sound(self.click_down_sound)
             pygame.mouse.set_cursor(self.click_cursor)
             self.set_relief(self.pressed_relief)
+            return True
+        return False
 
-    def do_on_click_up(self, button) -> None:
+    def on_click_up(self, button) -> None:
+        if super().on_click_up(button):
+            return True
         if self.enabled and button == 1 and self.is_pressed:
             self.is_pressed = False
             if self.click_up_sound:
                 bf.AudioManager().play_sound(self.click_up_sound)
             self.set_relief(self.unpressed_relief)
-            self.click()
-
+            return self.click()
+        return False
+    
     def on_enter(self) -> None:
         if not self.enabled:
             return
@@ -185,15 +199,6 @@ class ClickableWidget(Shape, InteractiveWidget):
         super().on_lose_focus()
         self.on_exit()
 
-    def on_key_down(self, key):
-        if key == pygame.K_SPACE:
-            self.on_click_down(1)
-        super().on_key_down(key)
-
-    def on_key_up(self, key):
-        if key == pygame.K_SPACE:
-            self.on_click_up(1)
-        super().on_key_up(key)
 
     def _paint_disabled(self) -> None:
         self.surface.blit(
@@ -205,16 +210,23 @@ class ClickableWidget(Shape, InteractiveWidget):
             self.get_surface_filter(), (0, 0), special_flags=pygame.BLEND_RGB_ADD
         )
 
-    def get_padded_rect(self) -> pygame.FRect:
+    def get_inner_rect(self) -> pygame.FRect:
         return pygame.FRect(
             self.rect.x + self.padding[0],
-            self.rect.y
-            + self.padding[1]
-            + (self.unpressed_relief - self.pressed_relief if self.is_pressed else 0),
+            self.rect.y + self.padding[1] + (self.unpressed_relief - self.pressed_relief if self.is_pressed else 0),
+            self.rect.w - self.padding[2] - self.padding[0],
+            self.rect.h - self.unpressed_relief - self.padding[1] - self.padding[3],
+        )
+
+    def get_local_padded_rect(self) -> pygame.FRect:
+        return pygame.FRect(
+            self.padding[0],
+            self.padding[1] + (self.unpressed_relief - self.pressed_relief if self.is_pressed else 0),
             self.rect.w - self.padding[2] - self.padding[0],
-            self.rect.h - self.unpressed_relief - self.padding[1] - self.padding[3],  #
+            self.rect.h - self.unpressed_relief - self.padding[1] - self.padding[3],
         )
 
+
     def _get_elevated_rect(self) -> pygame.FRect:
         return pygame.FRect(
             0,