tkfluent 0.0.9__py3-none-any.whl → 0.1.1__py3-none-any.whl

tkflu/menubar.py

@@ -1,8 +1,9 @@
 from tkinter import Frame, Menu
 from tkdeft.object import DObject
+from .designs.gradient import FluGradient
 
 
-class FluMenuBar(Frame, DObject):
+class FluMenuBar(Frame, DObject, FluGradient):
     def __init__(self, *args, mode="light", height=40, **kwargs):
         self._init(mode)
 
@@ -26,6 +27,9 @@ class FluMenuBar(Frame, DObject):
 
         self.theme(mode=mode)
 
+    def show(self):
+        self.pack(fill="x")
+
     def add_command(self, custom_widget=None, width=40, **kwargs):
         if custom_widget:
             widget = custom_widget(self)
@@ -103,6 +107,16 @@ class FluMenuBar(Frame, DObject):
     def action(self, id):
         return self.dcget("actions")[id]
 
+    def update_children(self):
+        actions = self.dcget("actions")
+        for key in actions:
+            widget = actions[key]
+            if hasattr(widget, "theme"):
+                widget.theme(mode=self.mode)
+                if hasattr(widget, "_draw"):
+                    widget._draw()
+                widget.update()
+
     def theme(self, mode="light"):
         self.theme_myself(mode=mode)
 
@@ -116,22 +130,30 @@ class FluMenuBar(Frame, DObject):
                     widget._draw()
                 widget.update()
 
-    def theme_myself(self, mode="light"):
+    def theme_myself(self, mode="light", animate_steps: int = 10):
+        from .designs.menubar import menubar
+        m = menubar(mode)
         self.mode = mode
         if mode.lower() == "dark":
-            self._dark()
+            if hasattr(self, "tk"):
+                back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=10)
+                for i in range(10):
+                    def update(ii=i):  # 使用默认参数立即捕获i的值
+                        self.dconfigure(back_color=back_colors[ii])
+                        self._draw()
+
+                    self.after(i * 10, update)  # 直接传递函数，不需要lambda
+                self.after(animate_steps*10+50, lambda: self.update_children())
         else:
-            self._light()
+            if hasattr(self, "tk"):
+                back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=10)
+                for i in range(10):
+                    def update(ii=i):  # 使用默认参数立即捕获i的值
+                        self.dconfigure(back_color=back_colors[ii])
+                        self._draw()
 
-    def _light(self):
-        self.dconfigure(
-            back_color="#f3f3f3"
-        )
+                    self.after(i * 20, update)  # 直接传递函数，不需要lambda
 
-    def _dark(self):
-        self.dconfigure(
-            back_color="#202020"
-        )
 
     def _draw(self, event=None):
         self.config(background=self.attributes.back_color)

tkflu/thememanager.py

@@ -13,7 +13,40 @@ class FluThemeManager(object):
         self.mode(self._mode)
         self._window.after(delay, lambda: self.mode(self._mode))
 
-    def mode(self, mode: str, delay: int or None = None):
+    def mode(self, mode: str, delay: int or None = 0):
+        def _():
+            self._mode = mode
+            if hasattr(self._window, "theme"):
+                self._window.theme(mode=mode)
+                if hasattr(self._window, "_draw"):
+                    self._window._draw()
+                self._window.update()
+            for widget in self._window.winfo_children():
+                if hasattr(widget, "theme"):
+                    widget.theme(mode=mode)
+                    if hasattr(widget, "_draw"):
+                        widget._draw()
+                    if hasattr(widget, "update_children"):
+                        widget.update_children()
+                    #widget.update()
+        if not delay == 0:
+            self._window.after(delay, _)
+        else:
+            _()
+        def __():
+            for widget in self._window.winfo_children():
+                if hasattr(widget, "_draw"):
+                    widget._draw()
+                if hasattr(widget, "update_children"):
+                    widget.update_children()
+                widget.update()
+        #self._window.after(delay+300, __)
+
+    def toggle(self, delay: int or None = None):
+        if self._mode == "light":
+            mode = "dark"
+        else:
+            mode = "light"
         def _():
             self._mode = mode
             if hasattr(self._window, "theme"):
@@ -30,4 +63,4 @@ class FluThemeManager(object):
         if delay:
             self._window.after(delay, _)
         else:
-            _()
+            _()

tkflu/togglebutton.py

@@ -1,3 +1,4 @@
+from easydict import EasyDict
 from tkdeft.windows.draw import DSvgDraw
 from tkdeft.windows.canvas import DCanvas
 from tkdeft.windows.drawwidget import DDrawWidget
@@ -60,9 +61,10 @@ class FluToggleButtonCanvas(DCanvas):
 
 
 from .tooltip import FluToolTipBase
+from .designs.gradient import FluGradient
 
 
-class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase):
+class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
     def __init__(self, *args,
                  text="",
                  width=120,
@@ -117,7 +119,7 @@ class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase):
 
         self.theme(mode=mode)
 
-    def _draw(self, event=None):
+    def _draw(self, event=None, tempcolor: dict = None):
         super()._draw(event)
 
         width = self.winfo_width()
@@ -128,39 +130,49 @@ class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase):
         state = self.dcget("state")
 
         _dict = None
-
-        if not self.attributes.checked:
-            if state == "normal":
-                if self.enter:
-                    if self.button1:
-                        _dict = self.attributes.uncheck.pressed
+        if not tempcolor:
+            if not self.attributes.checked:
+                if state == "normal":
+                    if self.enter:
+                        if self.button1:
+                            _dict = self.attributes.uncheck.pressed
+                        else:
+                            _dict = self.attributes.uncheck.hover
                     else:
-                        _dict = self.attributes.uncheck.hover
+                        _dict = self.attributes.uncheck.rest
                 else:
-                    _dict = self.attributes.uncheck.rest
+                    _dict = self.attributes.uncheck.disabled
             else:
-                _dict = self.attributes.uncheck.disabled
-        else:
-            if state == "normal":
-                if self.enter:
-                    if self.button1:
-                        _dict = self.attributes.check.pressed
+                if state == "normal":
+                    if self.enter:
+                        if self.button1:
+                            _dict = self.attributes.check.pressed
+                        else:
+                            _dict = self.attributes.check.hover
                     else:
-                        _dict = self.attributes.check.hover
+                        _dict = self.attributes.check.rest
                 else:
-                    _dict = self.attributes.check.rest
-            else:
-                _dict = self.attributes.check.disabled
-
-        _back_color = _dict.back_color
-        _back_opacity = _dict.back_opacity
-        _border_color = _dict.border_color
-        _border_color_opacity = _dict.border_color_opacity
-        _border_color2 = _dict.border_color2
-        _border_color2_opacity = _dict.border_color2_opacity
-        _border_width = _dict.border_width
-        _radius = _dict.radius
-        _text_color = _dict.text_color
+                    _dict = self.attributes.check.disabled
+
+            _back_color = _dict.back_color
+            _back_opacity = _dict.back_opacity
+            _border_color = _dict.border_color
+            _border_color_opacity = _dict.border_color_opacity
+            _border_color2 = _dict.border_color2
+            _border_color2_opacity = _dict.border_color2_opacity
+            _border_width = _dict.border_width
+            _radius = _dict.radius
+            _text_color = _dict.text_color
+        else:
+            _back_color = tempcolor.back_color
+            _back_opacity = tempcolor.back_opacity
+            _border_color = tempcolor.border_color
+            _border_color_opacity = tempcolor.border_color_opacity
+            _border_color2 = tempcolor.border_color2
+            _border_color2_opacity = tempcolor.border_color2_opacity
+            _border_width = tempcolor.border_width
+            _radius = tempcolor.radius
+            _text_color = tempcolor.text_color
 
         self.element_border = self.create_round_rectangle_with_text(
             0, 0, width, height, _radius, temppath=self.temppath,
@@ -379,9 +391,90 @@ class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase):
     def invoke(self):
         self.attributes.command()
 
-    def toggle(self):
+    def toggle(self, animate_steps: int = 10):
+        """
+
+        "back_color": "#ffffff",
+        "back_opacity": "0.7",
+        "border_color": "#000000",
+        "border_color_opacity": "0.2",
+        "border_color2": "#000000",
+        "border_color2_opacity": "0.3",
+        "border_width": 1,
+        "radius": 6,
+        "text_color": "#000000",
+        :return:
+        """
+        steps = animate_steps
+        check = self.attributes.check
+        uncheck = self.attributes.uncheck
+        if uncheck.pressed.border_color2 is None:
+            uncheck.pressed.border_color2 = uncheck.pressed.border_color
+        if check.pressed.border_color2  is None:
+            check.pressed.border_color2 = check.pressed.border_color
+        if uncheck.pressed.border_color2_opacity is None:
+            uncheck.pressed.border_color2_opacity = uncheck.pressed.border_color_opacity
+        if check.pressed.border_color2_opacity is None:
+            check.pressed.border_color2_opacity = check.pressed.border_color_opacity
         if self.attributes.checked:
             self.attributes.checked = False
+            back_colors = self.generate_hex2hex(
+                check.pressed.back_color, uncheck.rest.back_color, steps
+            )
+            border_colors = self.generate_hex2hex(
+                check.pressed.border_color, uncheck.rest.border_color, steps
+            )
+            border_colors2 = self.generate_hex2hex(
+                check.pressed.border_color2, uncheck.rest.border_color2, steps
+            )
+            text_colors = self.generate_hex2hex(
+                check.pressed.text_color, uncheck.rest.text_color, steps
+            )
+            import numpy as np
+            back_opacitys = np.linspace(
+                float(check.pressed.back_opacity), float(uncheck.rest.back_opacity), steps).tolist()
+            border_color_opacitys = np.linspace(
+                float(check.pressed.border_color_opacity), float(uncheck.rest.border_color_opacity), steps).tolist()
+            border_color2_opacitys = np.linspace(
+                float(check.pressed.border_color2_opacity), float(uncheck.rest.border_color2_opacity), steps).tolist()
         else:
             self.attributes.checked = True
-        self._draw(None)
+            back_colors = self.generate_hex2hex(
+                uncheck.pressed.back_color, check.rest.back_color, steps
+            )
+            border_colors = self.generate_hex2hex(
+                uncheck.pressed.back_color, check.rest.back_color, steps
+            )
+            border_colors2 = self.generate_hex2hex(
+                uncheck.pressed.border_color2, check.rest.border_color2, steps
+            )
+            text_colors = self.generate_hex2hex(
+                uncheck.pressed.text_color, check.rest.text_color, steps
+            )
+            import numpy as np
+            back_opacitys = np.linspace(float(uncheck.pressed.back_opacity), float(check.rest.back_opacity),
+                                        steps).tolist()
+            border_color_opacitys = np.linspace(float(uncheck.pressed.border_color_opacity), float(check.rest.border_color_opacity),
+                                        steps).tolist()
+            border_color2_opacitys = np.linspace(float(uncheck.pressed.border_color2_opacity),
+                                                float(check.rest.border_color2_opacity),
+                                                steps).tolist()
+        for i in range(steps):
+            def update(ii=i):
+                from easydict import EasyDict
+                tempcolor = EasyDict(
+                    {
+                        "back_color": back_colors[ii],
+                        "back_opacity": back_opacitys[ii],
+                        "border_color": border_colors[ii],
+                        "border_color_opacity": str(border_color_opacitys[ii]),
+                        "border_color2": border_colors2[ii],
+                        "border_color2_opacity": str(border_color2_opacitys[ii]),
+                        "border_width": 1,
+                        "text_color": text_colors[ii],
+                        "radius": 6,
+                    }
+                )
+                self._draw(None, tempcolor)
+            self.after(i*10, update)
+        self.after(steps*10+10, lambda: self._draw(None, None))

tkflu/tooltip.py

@@ -66,7 +66,7 @@ class FluToolTip(FluPopupWindow):
             background=n["back_color"]
         )
         self.wm_attributes("-transparentcolor", n["back_color"])
-        print(n["back_color"])
+        #print(n["back_color"])
         if hasattr(self, "_frame"):
             self._frame.dconfigure(
                 back_color=n["frame_color"],
@@ -128,7 +128,7 @@ class FluToolTip2(FluPopupWindow):
             background=n["back_color"]
         )
         self.wm_attributes("-transparentcolor", n["back_color"])
-        print(n["back_color"])
+        #print(n["back_color"])
         if hasattr(self, "_frame"):
             self._frame.dconfigure(
                 back_color=n["frame_color"],