batframework 1.0.9a10__py3-none-any.whl → 1.0.10__py3-none-any.whl

batFramework/gui/toggle.py

@@ -1,128 +1,62 @@
 from .button import Button
-from .indicator import Indicator, ToggleIndicator
-from .shape import Shape
+from .indicator import Indicator,ToggleIndicator
+import pygame
 import batFramework as bf
-from typing import Self,Callable,Any
+from typing import Self
 
 class Toggle(Button):
-    def __init__(self, text: str = "", callback : Callable[[bool],Any]=None, default_value: bool = False) -> None:
-        self.value: bool = default_value
-        self.indicator: ToggleIndicator = ToggleIndicator(default_value)
-        self.gap: float | int = 0
-        self.spacing: bf.spacing = bf.spacing.MANUAL
-        super().__init__(text, callback)
-        self.add(self.indicator)
-        self.set_clip_children(False)
-
-    def set_visible(self, value: bool) -> Self:
-        self.indicator.set_visible(value)
-        return super().set_visible(value)
-
-    def set_value(self, value: bool, do_callback=False) -> Self:
-        self.value = value
-        self.indicator.set_value(value)
-        self.dirty_surface = True
-        if do_callback and self.callback:
-            self.callback(self.value)
-        return self
-
-    def set_spacing(self, spacing: bf.spacing) -> Self:
-        if spacing == self.spacing:
-            return self
-        self.spacing = spacing
-        self.dirty_shape = True
-        return self
-
-    def click(self) -> None:
-        self.set_value(not self.value, True)
-
-    def set_gap(self, value: int | float) -> Self:
-        value = max(0, value)
-        if value == self.gap:
-            return self
+    def __init__(self,text:str,default_value : bool = False)->None:
+        self.value :bool= default_value
+        self.on_toggle = None
+        self.indicator : Indicator=ToggleIndicator(default_value)
+        self.gap :float|int = 0
+        super().__init__(text,self.toggle)
+        self.add_child(self.indicator)
+        self.set_gap(int(max(4,self.get_content_width()/3)))
+        # self.set_gap()
+        # self.set_gap(20)
+
+    def set_gap(self,value:int|float)->Self:
+        if value < 0 : return self
         self.gap = value
-        self.dirty_shape = True
+        self.build()
+        if self.parent : self.parent.children_modified()
         return self
-
-    def __str__(self) -> str:
+    def to_string_id(self)->str:
         return f"Toggle({self.value})"
+        
+    def toggle(self)->None:
+        self.value = not self.value
+        self.build()
+        if self.on_toggle : self.on_toggle(self.value)
 
-    def toggle(self) -> None:
-        self.set_value(not self.value, do_callback=True)
-
-    def get_min_required_size(self) -> tuple[float, float]:
-        if not self.text_rect:
-            self.text_rect.size = self._get_text_rect_required_size()
-
-        text_width, text_height = self.text_rect.size
-        indicator_size = self.indicator.get_min_required_size()[1]
-        gap = self.gap if self.text else 0
-
-        total_width = text_width + gap + indicator_size
-        total_height = text_height + self.unpressed_relief
-
-        return self.expand_rect_with_padding((0, 0, total_width, total_height)).size
-
-    def _build_composed_layout(self,other:Shape):
-        size_changed = False
-        self.text_rect.size = self._get_text_rect_required_size()
-
-        gap = self.gap if self.text else 0
-        full_rect = self.text_rect.copy()
+    def set_toggle_callback(self,callback)->Self:
+        self.on_toggle = callback
+        return self
 
-        other_height = min(self.text_rect.h, self.font_object.get_height()+1)
-        other.set_size(other.resolve_size((other_height,other_height)))
+    def _build_layout(self)->None:
+        self.indicator.set_value(self.value)
         
-        full_rect.w += other.rect.w + gap
-        full_rect.h += self.unpressed_relief
+        size = (
+            0,
+            0,
+            self._text_rect.w + self.indicator.rect.w + self.gap,
+            max(self._text_rect.h, self.indicator.rect.h)
+        )
         
-
-        # take into account the relief when calculating target size
-        inflated = self.expand_rect_with_padding((0, 0, *full_rect.size)).size
-        target_size = self.resolve_size(inflated)
-        if self.rect.size != target_size:
-            self.set_size(target_size)
-            size_changed = True
-
-        self._align_composed(other)
-        return size_changed
-
-    def _align_composed(self,other:Shape):
+        required_rect = self.inflate_rect_by_padding(size)
         
-        full_rect = self.get_local_inner_rect()
-        left_rect = self.text_rect
-        right_rect = other.rect
-        gap = {
-            bf.spacing.MIN: 0,
-            bf.spacing.HALF: (full_rect.width - left_rect.width - right_rect.width) // 2,
-            bf.spacing.MAX: full_rect.width - left_rect.width - right_rect.width,
-            bf.spacing.MANUAL: self.gap
-        }.get(self.spacing, 0)
-
-        gap = max(0, gap)
-        combined_width = left_rect.width + right_rect.width + gap
-
-        group_x = {
-            bf.alignment.LEFT: full_rect.left,
-            bf.alignment.MIDLEFT: full_rect.left,
-            bf.alignment.RIGHT: full_rect.right - combined_width,
-            bf.alignment.MIDRIGHT: full_rect.right - combined_width,
-            bf.alignment.CENTER: full_rect.centerx - combined_width // 2
-        }.get(self.alignment, full_rect.left)
-
-        left_rect.x, right_rect.x = group_x, group_x + left_rect.width + gap
-
-        if self.alignment in {bf.alignment.TOP, bf.alignment.TOPLEFT, bf.alignment.TOPRIGHT}:
-            left_rect.top = right_rect.top = full_rect.top
-        elif self.alignment in {bf.alignment.BOTTOM, bf.alignment.BOTTOMLEFT, bf.alignment.BOTTOMRIGHT}:
-            left_rect.bottom = right_rect.bottom = full_rect.bottom
-        else:
-            left_rect.centery = right_rect.centery = full_rect.centery
-
-        right_rect.move_ip(*self.rect.topleft)
-
-    def _build_layout(self) -> None:
-        return self._build_composed_layout(self.indicator)
-
+        if self.autoresize and (self.rect.size != required_rect.size) :
+            self.set_size(*required_rect.size)
+            return
 
+        required_rect = self.get_content_rect()
+        required_rect_rel = self.get_content_rect_rel()
 
+        self._text_rect.midleft = required_rect_rel.midleft
+        r = self.indicator.rect.copy()
+        r.midleft = required_rect.move(self._text_rect.w+self.gap,0).midleft
+        self.indicator.set_position(*r.topleft)
+        
+        self.surface.blit(self._text_surface,self._text_rect)
+