tkfluent 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

tkflu/__init__.py

@@ -1,9 +1,11 @@
-"""、
+"""
 
 Fluent设计的tkinter组件库（模板）
 
 -------------
 作者：XiangQinxi
+
+贡献者：totowang-hhh
 -------------
 """
 

tkflu/__main__.py

@@ -2,9 +2,9 @@ from tkflu import *
 from tkinter import *
 from tkinter.font import *
 
-orange_primary_color()
+purple_primary_color()
 set_animation_steps(10)
-set_animation_step_time(20)
+set_animation_step_time(10)
 
 def togglestate():
     if button1.dcget("state") == NORMAL:

tkflu/button.py

@@ -4,13 +4,39 @@ from tkdeft.windows.drawwidget import DDrawWidget
 
 from .designs.button import button
 
+from typing import Union
+
 
 class FluButtonDraw(DSvgDraw):
     def create_roundrect(self,
-                         x1, y1, x2, y2, radius, radiusy=None, temppath=None,
-                         fill="transparent", fill_opacity=1,
-                         outline="black", outline2=None, outline_opacity=1, outline2_opacity=1, width=1,
-                         ):
+                         x1: Union[int, float], y1: Union[int, float], x2: Union[int, float], y2: Union[int, float],
+                         radius: Union[int, float], radiusy: Union[int, float] = None, temppath: Union[str, None] = None,
+                         fill: Union[str, tuple]="transparent", fill_opacity: Union[int, float]=1,
+                         outline: Union[str, tuple] = "black", outline2: Union[str, tuple] = None,
+                         outline_opacity: Union[int, float] = 1, outline2_opacity: Union[int, float] = 1, width: Union[int, float] = 1,
+                         ) -> str:
+        """
+        用于生成svg圆角矩形图片，图片默认将会保存至临时文件夹。
+
+        Parameters:
+          x1: 第一个x轴的坐标
+          y1: 第一个y轴的坐标
+          x2: 第二个x轴的坐标，与x1连起来
+          y2: 第二个y轴的坐标，与y1连起来
+          radius: 圆角大小
+          radiusy: 圆角大小（y轴方向），如果不设置，将默认为参数radius的值
+          temppath: 临时文件地址，如果你不知道，就别设置
+          fill: 背景颜色
+          fill_opacity: 背景透明度
+          outline: 边框颜色
+          outline2: 边框颜色2（渐变），如果取了这个值，边框将会变为渐变，从左到右，outline为第一个渐变色,outline2为第二个渐变色
+          outline_opacity: 边框透明度
+          outline2_opacity: 第二个边框渐变颜色的透明度，如果outline没有设置，则这个值不会被用到
+          width: 边框宽度
+
+        Returns:
+         svg图片保存地址
+        """
         if radiusy:
             _rx = radius
             _ry = radiusy
@@ -19,9 +45,9 @@ class FluButtonDraw(DSvgDraw):
         drawing = self.create_drawing(x2 - x1, y2 - y1, temppath=temppath)
         if outline2:
             border = drawing[1].linearGradient(start=(x1, y1), end=(x1, y2), id="DButton.Border",
-                                               gradientUnits="userSpaceOnUse")
-            border.add_stop_color("0.9", outline, outline_opacity)
-            border.add_stop_color("1", outline2, outline2_opacity)
+                                               gradientUnits="userSpaceOnUse")  # 渐变色配置
+            border.add_stop_color("0.9", outline, outline_opacity)  # 第一个渐变色的位置、第一个渐变色、第一个渐变色的透明度
+            border.add_stop_color("1", outline2, outline2_opacity)  # 第二个渐变色的位置、第二个渐变色、第二个渐变色的透明度
             drawing[1].defs.add(border)
             stroke = f"url(#{border.get_id()})"
             stroke_opacity = 1
@@ -41,41 +67,80 @@ class FluButtonDraw(DSvgDraw):
 
 
 class FluButtonCanvas(DCanvas):
-    draw = FluButtonDraw
+
+    draw = FluButtonDraw  # 设置svg绘图引擎
 
     def create_round_rectangle(self,
-                               x1, y1, x2, y2, r1, r2=None, temppath=None,
-                               fill="transparent", fill_opacity=1,
-                               outline="black", outline2="black", outline_opacity=1, outline2_opacity=1,
-                               width=1,
-                               ):
+                               x1: Union[int, float], y1: Union[int, float], x2: Union[int, float], y2: Union[int, float],
+                               r1: Union[int, float], r2: Union[int, float] = None, temppath: Union[str, None] = None,
+                               fill: Union[str, tuple]="transparent", fill_opacity: Union[int, float] = 1,
+                               outline: Union[str, tuple] = "black", outline2: Union[str, tuple] = "black",
+                               outline_opacity: Union[int, float] = 1, outline2_opacity: Union[int, float] = 1,
+                               width: Union[int, float] = 1, *args, **kwargs
+                               ) -> int:
+        """
+        在画布上创建个圆角矩形
+
+        Parameters:
+          x1: 第一个x轴的坐标
+          y1: 第一个y轴的坐标
+          x2: 第二个x轴的坐标，与x1连起来
+          y2: 第二个y轴的坐标，与y1连起来
+          r1: 圆角大小
+          r2: 圆角大小（y轴方向），如果不设置，将默认为参数r1的值
+          temppath: 临时文件地址，如果你不知道，就别设置
+          fill: 背景颜色
+          fill_opacity: 背景透明度
+          outline: 边框颜色
+          outline2: 边框颜色2（渐变），如果取了这个值，边框将会变为渐变，从左到右，outline为第一个渐变色,outline2为第二个渐变色
+          outline_opacity: 边框透明度
+          outline2_opacity: 第二个边框渐变颜色的透明度，如果outline没有设置，则这个值不会被用到
+          width: 边框宽度
+
+        Returns: svg图片保存地址
+        """
         self._img = self.svgdraw.create_roundrect(
             x1, y1, x2, y2, r1, r2, temppath=temppath,
             fill=fill, fill_opacity=fill_opacity,
             outline=outline, outline2=outline2, outline_opacity=outline_opacity, outline2_opacity=outline2_opacity,
             width=width,
-        )
-        self._tkimg = self.svgdraw.create_tksvg_image(self._img)
-        return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
+        )  # 创建个svg圆角矩形图片
+        self._tkimg = self.svgdraw.create_tksvg_image(self._img)  # 用tksvg读取svg图片
+        return self.create_image(x1, y1, anchor="nw", image=self._tkimg, *args, **kwargs)  # 在画布上创建个以svg图片为图片的元件
 
-    create_roundrect = create_round_rectangle
+    create_roundrect = create_round_rectangle  # 缩写
 
 
 from .constants import MODE, STATE, BUTTONSTYLE
 from .tooltip import FluToolTipBase
 from .designs.gradient import FluGradient
+from tkinter import Event
+from tkinter.font import Font
 
 class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
     def __init__(self, *args,
-                 text="",
-                 width=120,
-                 height=32,
-                 command=None,
-                 font=None,
+                 text: Union[str, int, float]= "",
+                 width: Union[int, float] = 120,
+                 height: Union[int, float] = 32,
+                 command: callable = None,
+                 font: Union[Font, tuple] = None,
                  mode: MODE = "light",
                  style: BUTTONSTYLE = "standard",
                  state: STATE = "normal",
-                 **kwargs):
+                 **kwargs) -> None:
+        """
+        按钮组件
+
+        Parameters:
+          text: 按钮的标签文本
+          width: 默认宽带
+          height: 默认高度
+          command: 点击时出发的事件
+          font: 自定义标签字体
+          mode: 按钮深浅主题，参考tkflu.constants.MODE
+          style: 按钮样式，参考tkflu.constants.BUTTONSTYLE
+          state: 按钮的状态，参考tkflu.constants.STATE
+        """
         self._init(mode, style)
 
         super().__init__(*args, width=width, height=height, **kwargs)
@@ -101,6 +166,14 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
 
     def _init(self, mode: MODE, style: BUTTONSTYLE):
 
+        """
+        初始化按钮，正常情况下无需在程序中调用
+
+        Parameters:
+          mode: 按钮深浅主题，参考tkflu.constants.MODE
+          style: 按钮样式，参考tkflu.constants.BUTTONSTYLE
+        """
+
         from easydict import EasyDict
 
         self.enter = False
@@ -122,13 +195,17 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
 
         self.theme(mode=mode, style=style)
 
-    def _draw(self, event=None, tempcolor: dict = None):
+    def _draw(self, event: Union[Event, None] = None, tempcolor: Union[dict, None] = None):
+        """
+
+        Parameters:
+          绘制按钮
+        """
         super()._draw(event)
 
         width = self.winfo_width()
         height = self.winfo_height()
-
-        self.delete("all")
+        # 提前定义，反正多次调用浪费资源
 
         state = self.dcget("state")
 
@@ -166,6 +243,9 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
             _radius = tempcolor.radius
             _text_color = tempcolor.text_color
 
+        if hasattr(self, "element_border"):
+            self.delete(self.element_border)
+
         self.element_border = self.create_round_rectangle(
             0, 0, width, height, _radius, temppath=self.temppath,
             fill=_back_color, fill_opacity=_back_opacity,
@@ -174,10 +254,15 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
             width=_border_width,
         )
 
-        self.element_text = self.create_text(
-            self.winfo_width() / 2, self.winfo_height() / 2, anchor="center",
-            fill=_text_color, text=self.attributes.text, font=self.attributes.font
-        )
+        if hasattr(self, "element_text"):
+            self.itemconfigure(self.element_text, fill=_text_color, text=self.attributes.text, font=self.attributes.font)
+            self.coords(self.element_text, width / 2, height / 2)
+        else:
+            self.element_text = self.create_text(
+                width / 2, height / 2, anchor="center",
+                fill=_text_color, text=self.attributes.text, font=self.attributes.font
+            )
+        self.tag_raise(self.element_text, self.element_border)
 
         self.update()
 
@@ -186,7 +271,17 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
             self.mode = mode
         if style:
             self.style = style
-        if self.mode.lower() == "dark":
+        theme_handlers = {
+            ("light", "accent"): self._light_accent,
+            ("light", "menu"): self._light_menu,
+            ("light", "standard"): self._light,
+            ("dark", "accent"): self._dark_accent,
+            ("dark", "menu"): self._dark_menu,
+            ("dark", "standard"): self._dark,
+        }
+        handler = theme_handlers.get((self.mode.lower(), self.style.lower()))
+        handler()
+        """if self.mode.lower() == "dark":
             if self.style.lower() == "accent":
                 self._dark_accent()
             elif self.style.lower() == "menu":
@@ -199,9 +294,9 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
             elif self.style.lower() == "menu":
                 self._light_menu()
             else:
-                self._light()
+                self._light()"""
 
-    def _theme(self, mode, style, animation_steps: int = None, animation_step_time: int = None):
+    def _theme(self, mode: MODE, style: BUTTONSTYLE, animation_steps: int = None, animation_step_time: int = None):
         if animation_steps is None:
             from .designs.animation import get_animation_steps
             animation_steps = get_animation_steps()
@@ -212,66 +307,67 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
         h = button(mode, style, "hover")
         p = button(mode, style, "pressed")
         d = button(mode, style, "disabled")
-        if self.dcget("state") == "normal":
-            if self.enter:
-                if self.button1:
-                    now = p
+        if not animation_steps == 0 or not animation_step_time == 0:
+            if self.dcget("state") == "normal":
+                if self.enter:
+                    if self.button1:
+                        now = p
+                    else:
+                        now = h
                 else:
-                    now = h
+                    now = r
             else:
-                now = r
-        else:
-            now = d
-        #print(animation_step_time)
-        #print(type(animation_step_time))
-        if hasattr(self.attributes.rest, "back_color"):
-            back_colors = self.generate_hex2hex(
-                self.attributes.rest.back_color, now["back_color"], animation_steps
-            )
-            border_colors = self.generate_hex2hex(
-                self.attributes.rest.border_color, now["border_color"], animation_steps
-            )
-            if self.attributes.rest.border_color2 is None:
-                self.attributes.rest.border_color2 = self.attributes.rest.border_color
-            if now["border_color2"] is None:
-                now["border_color2"] = now["border_color"]
-            border_colors2 = self.generate_hex2hex(
-                self.attributes.rest.border_color2, now["border_color2"], animation_steps
-            )
-            text_colors = self.generate_hex2hex(
-                self.attributes.rest.text_color, now["text_color"], animation_steps
-            )
-            import numpy as np
-            back_opacitys = np.linspace(
-                float(self.attributes.rest.back_opacity), float(now["back_opacity"]), animation_steps).tolist()
-            border_color_opacitys = np.linspace(
-                float(self.attributes.rest.border_color_opacity), float(now["border_color_opacity"]), animation_steps).tolist()
-            if self.attributes.rest.border_color2_opacity is None:
-                self.attributes.rest.border_color2_opacity = self.attributes.rest.border_color_opacity
-            if now["border_color2_opacity"] is None:
-                now["border_color2_opacity"] = now["border_color_opacity"]
-            border_color2_opacitys = np.linspace(
-                float(self.attributes.rest.border_color2_opacity), float(now["border_color2_opacity"]), animation_steps).tolist()
-            for i in range(animation_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 * animation_step_time, update)
-            #self.after(animation_steps * animation_step_time + 10, lambda: self._draw(None, None))
+                now = d
+            #print(animation_step_time)
+            #print(type(animation_step_time))
+            if hasattr(self.attributes.rest, "back_color"):
+                back_colors = self.generate_hex2hex(
+                    self.attributes.rest.back_color, now["back_color"], animation_steps
+                )
+                border_colors = self.generate_hex2hex(
+                    self.attributes.rest.border_color, now["border_color"], animation_steps
+                )
+                if self.attributes.rest.border_color2 is None:
+                    self.attributes.rest.border_color2 = self.attributes.rest.border_color
+                if now["border_color2"] is None:
+                    now["border_color2"] = now["border_color"]
+                border_colors2 = self.generate_hex2hex(
+                    self.attributes.rest.border_color2, now["border_color2"], animation_steps
+                )
+                text_colors = self.generate_hex2hex(
+                    self.attributes.rest.text_color, now["text_color"], animation_steps
+                )
+                import numpy as np
+                back_opacitys = np.linspace(
+                    float(self.attributes.rest.back_opacity), float(now["back_opacity"]), animation_steps).tolist()
+                border_color_opacitys = np.linspace(
+                    float(self.attributes.rest.border_color_opacity), float(now["border_color_opacity"]), animation_steps).tolist()
+                if self.attributes.rest.border_color2_opacity is None:
+                    self.attributes.rest.border_color2_opacity = self.attributes.rest.border_color_opacity
+                if now["border_color2_opacity"] is None:
+                    now["border_color2_opacity"] = now["border_color_opacity"]
+                border_color2_opacitys = np.linspace(
+                    float(self.attributes.rest.border_color2_opacity), float(now["border_color2_opacity"]), animation_steps).tolist()
+                for i in range(animation_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 * animation_step_time, update)
+                #self.after(animation_steps * animation_step_time + 10, lambda: self._draw(None, None))
 
         self.dconfigure(
             rest={
@@ -341,7 +437,7 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
     def invoke(self):
         self.attributes.command()
 
-    def _event_off_button1(self, event=None):
+    def _event_off_button1(self, event: Event = None):
         self.button1 = False
 
         self._draw(event)

tkflu/bwm.py

@@ -137,14 +137,15 @@ class BWm(FluGradient):
         if animation_step_time is None:
             from .designs.animation import get_animation_step_time
             animation_step_time = get_animation_step_time()
-        if self.dcget("back_color"):
-            back_colors = self.generate_hex2hex(self.dcget("back_color"), n["back_color"], steps=animation_steps)
-            for i in range(animation_steps):
-                def update(ii=i):  # 使用默认参数立即捕获i的值
-                    self.dconfigure(back_color=back_colors[ii])
-                    self._draw()
+        if not animation_steps == 0 or not animation_step_time == 0:
+            if self.dcget("back_color"):
+                back_colors = self.generate_hex2hex(self.dcget("back_color"), n["back_color"], steps=animation_steps)
+                for i in range(animation_steps):
+                    def update(ii=i):  # 使用默认参数立即捕获i的值
+                        self.dconfigure(back_color=back_colors[ii])
+                        self._draw()
 
-                self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
 
         self.dconfigure(
             back_color=n["back_color"],
@@ -186,6 +187,8 @@ class BWm(FluGradient):
         if platform == "win32":
             if way == 0:
                 from .customwindow import CustomWindow
+                import warnings
+                warnings.warn("This is EXPERIMENTAL! Please consider way=1 in production.")
                 self.customwindow = CustomWindow(self, wait=wait)
                 self.customwindow.bind_drag(self.titlebar)
                 self.customwindow.bind_drag(self.titlelabel)

tkflu/demos/grad2.py

@@ -1,7 +1,7 @@
 from tkflu import *
 
 set_animation_steps(20)
-set_animation_step_time(50)
+set_animation_step_time(20)
 
 root = FluWindow()
 

tkflu/frame.py

@@ -189,17 +189,17 @@ class FluFrame(Frame, DObject, FluGradient):
         if animation_step_time is None:
             from .designs.animation import get_animation_step_time
             animation_step_time = get_animation_step_time()
-
-        if hasattr(self.attributes, "back_color") and hasattr(n, "back_color"):
-            back_colors = self.generate_hex2hex(self.attributes.back_color, n["back_color"], steps=animation_steps)
-            for i in range(animation_steps):
-                def update(ii=i):  # 使用默认参数立即捕获i的值
-                    print(back_colors[ii])
-                    self._draw(tempcolor=back_colors[ii])
-                    self.update()
-
-                self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
-        self.after(animation_steps * animation_step_time + 10, lambda: self._draw())
+        if not animation_steps == 0 or not animation_step_time == 0:
+            if hasattr(self.attributes, "back_color") and hasattr(n, "back_color"):
+                back_colors = self.generate_hex2hex(self.attributes.back_color, n["back_color"], steps=animation_steps)
+                for i in range(animation_steps):
+                    def update(ii=i):  # 使用默认参数立即捕获i的值
+                        print(back_colors[ii])
+                        self._draw(tempcolor=back_colors[ii])
+                        self.update()
+
+                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+            self.after(animation_steps * animation_step_time + 10, lambda: self._draw())
         self.dconfigure(
             back_color=n["back_color"],
             border_color=n["border_color"],

tkflu/image.py

@@ -0,0 +1,4 @@
+from .frame import FluFrame
+
+
+class FluImage(FluFrame):

tkflu/label.py

@@ -41,17 +41,19 @@ class FluLabel(DDrawWidget, FluToolTipBase, FluGradient):
     def _draw(self, event=None, tempcolor=None):
         super()._draw(event)
 
-        self.delete("all")
-
         if tempcolor:
             _text_color = tempcolor
         else:
             _text_color = self.attributes.text_color
 
-        self.element_text = self.create_text(
-            self.winfo_width() / 2, self.winfo_height() / 2, anchor="center",
-            fill=_text_color, text=self.attributes.text, font=self.attributes.font
-        )
+        if not hasattr(self, "element_text"):
+            self.element_text = self.create_text(
+                self.winfo_width() / 2, self.winfo_height() / 2, anchor="center",
+                fill=_text_color, text=self.attributes.text, font=self.attributes.font
+            )
+        else:
+            self.coords(self.element_text, self.winfo_width() / 2, self.winfo_height() / 2)
+            self.itemconfigure(self.element_text, fill=_text_color, text=self.attributes.text, font=self.attributes.font)
 
     def theme(self, mode="light", animation_steps: int = None, animation_step_time: int = None):
         from .designs.label import label

tkflu/menubar.py

@@ -141,24 +141,31 @@ class FluMenuBar(Frame, DObject, FluGradient):
         m = menubar(mode)
         self.mode = mode
         if hasattr(self, "tk"):
-            if mode.lower() == "dark":
-                back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=animation_steps)
-                for i in range(animation_steps):
-                    def update(ii=i):  # 使用默认参数立即捕获i的值
-                        self.dconfigure(back_color=back_colors[ii])
-                        self._draw()
-
-                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+            if not animation_steps == 0 or not animation_step_time == 0:
+                if mode.lower() == "dark":
+                    back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=animation_steps)
+                    for i in range(animation_steps):
+                        def update(ii=i):  # 使用默认参数立即捕获i的值
+                            self.dconfigure(back_color=back_colors[ii])
+                            self._draw()
+
+                        self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+                else:
+                    back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=animation_steps)
+                    for i in range(animation_steps):
+                        def update(ii=i):  # 使用默认参数立即捕获i的值
+                            self.dconfigure(back_color=back_colors[ii])
+                            self._draw()
+
+                        self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+
+                self.after(animation_steps * animation_step_time + 50, lambda: self.update_children())
             else:
-                back_colors = self.generate_hex2hex(self.attributes.back_color, m["back_color"], steps=animation_steps)
-                for i in range(animation_steps):
-                    def update(ii=i):  # 使用默认参数立即捕获i的值
-                        self.dconfigure(back_color=back_colors[ii])
-                        self._draw()
-
-                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
-
-            self.after(animation_steps * animation_step_time + 50, lambda: self.update_children())
+                if mode.lower() == "dark":
+                    self.dconfigure(back_color=m["back_color"])
+                else:
+                    self.dconfigure(back_color=m["back_color"])
+                self._draw()
 
     def _draw(self, event=None):
         self.config(background=self.attributes.back_color)

tkflu/text.py

@@ -172,6 +172,8 @@ class FluText(FluTextCanvas, DDrawWidget, FluToolTipBase):
             height=self.winfo_height() - _border_width * 2 - _radius
         )
 
+        if hasattr(self, "element_border"):
+            self.delete(self.element_border)
         self.element_border = self.create_round_rectangle(
             0, 0, width, height, _radius, temppath=self.temppath,
             fill=_back_color, fill_opacity=_back_opacity, stop1=_stop1, stop2=_stop2,
@@ -179,20 +181,50 @@ class FluText(FluTextCanvas, DDrawWidget, FluToolTipBase):
             outline2_opacity=_border_color2_opacity,
             width=_border_width
         )
-
+        """if _underline_fill:
+            if not hasattr(self, "element_line"):
+                self.element_line = self.create_line(
+                    _radius / 3 + _border_width, self.winfo_height() - _radius / 3,
+                    self.winfo_width() - _radius / 3 - _border_width * 2, self.winfo_height() - _radius / 3,
+                    width=_underline_width, fill=_underline_fill
+                )
+            else:
+                self.coords(
+                    self.element_line, _radius / 3 + _border_width, self.winfo_height() - _radius / 3,
+                    self.winfo_width() - _radius / 3 - _border_width * 2, self.winfo_height() - _radius / 3,
+                )
+                self.itemconfigure(self.element_line, width=_underline_width, fill=_underline_fill)
+        """
+        if hasattr(self, "element_line"):
+            self.delete(self.element_line)
         if _underline_fill:
             self.element_line = self.create_line(
                 _radius / 3 + _border_width, self.winfo_height() - _radius / 3,
                 self.winfo_width() - _radius / 3 - _border_width * 2, self.winfo_height() - _radius / 3,
                 width=_underline_width, fill=_underline_fill
             )
-
+        """        
+        if not hasattr(self, "element_text"):
+            self.element_text = self.create_window(
+                self.winfo_width() / 2, self.winfo_height() / 2,
+                window=self.text,
+                width=self.winfo_width() - _border_width * 2 - _radius,
+                height=self.winfo_height() - _border_width * 2 - _radius
+            )
+        else:
+            self.coords(self.element_text, self.winfo_width() / 2, self.winfo_height() / 2,
+                        self.winfo_width() - _border_width * 2 - _radius, self.winfo_height() - _border_width * 2 - _radius)
+        """
+        if hasattr(self, "element_text"):
+            self.delete(self.element_text)
         self.element_text = self.create_window(
             self.winfo_width() / 2, self.winfo_height() / 2,
             window=self.text,
             width=self.winfo_width() - _border_width * 2 - _radius,
             height=self.winfo_height() - _border_width * 2 - _radius
         )
+        self.tag_raise(self.element_text, self.element_border)
+        self.tag_raise(self.element_line, self.element_border)
 
         #self.tag_raise(self.element_text)
 

tkflu/thememanager.py

@@ -1,9 +1,10 @@
 from .window import FluWindow
 from .toplevel import FluToplevel
+from typing import Union
 
 
 class FluThemeManager(object):
-    def __init__(self, window=None, mode: str = "light", delay: int or None = 100):
+    def __init__(self, window=None, mode: str = "light", delay: Union[int, None] = 100):
         if window:
             self._window = window
         else:
@@ -13,7 +14,7 @@ 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 = 50):
+    def mode(self, mode: str, delay: Union[int, None] = 50):
         def _():
             self._mode = mode
             if hasattr(self._window, "theme"):
@@ -43,7 +44,7 @@ class FluThemeManager(object):
         #print(len(self._window.winfo_children()))
         self._window.after(delay+len(self._window.winfo_children()), __)
 
-    def toggle(self, delay: int or None = None):
+    def toggle(self, delay: Union[int, None] = None):
         if self._mode == "light":
             mode = "dark"
         else:

tkflu/togglebutton.py

@@ -398,76 +398,82 @@ class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase, FluGra
         if animation_step_time is None:
             from .designs.animation import get_animation_step_time
             animation_step_time = get_animation_step_time()
-        steps = animation_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
-            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,
-                    }
+        if not animation_steps == 0 or not animation_step_time == 0:
+            steps = animation_steps
+            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
                 )
-                self._draw(None, tempcolor)
-            self.after(i*animation_step_time, update)
-        self.after(steps*animation_step_time+10, lambda: self._draw(None, None))
+                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
+                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*animation_step_time, update)
+            self.after(steps*animation_step_time+10, lambda: self._draw(None, None))
+        else:
+            if self.attributes.checked:
+                self.attributes.checked = False
+            else:
+                self.attributes.checked = True

tkflu/tooltip.py

@@ -1,5 +1,6 @@
 from .popupwindow import FluPopupWindow
 from tkinter import Event, Widget
+import sys
 
 
 class FluToolTip(FluPopupWindow):
@@ -26,7 +27,7 @@ class FluToolTip(FluPopupWindow):
         self._widget.bind('<Enter>', self.enter, add="+")
         self._widget.bind('<Leave>', self.leave, add="+")
 
-        #self.theme(mode)
+        self.theme(mode)
 
     def enter(self, event: Event):
         def check() -> None:
@@ -44,10 +45,12 @@ class FluToolTip(FluPopupWindow):
 
                 # 渐显动画
                 def fade_in(step=0):
-                    alpha = step / 10  # 分10步从0到1
+                    FRAMES_COUNT = 20
+                    alpha = step / FRAMES_COUNT  # 按帧数变化，从0到1
                     self.wm_attributes("-alpha", alpha)
-                    if step < 10:
-                        self.after(int(round(self._show_time/10)), lambda: fade_in(step + 1))  # 每50ms增加一次透明度
+                    if step < FRAMES_COUNT:
+                        # 每执行一次，增加一次透明度，间隔由帧数决定
+                        self.after(int(round(self._show_time/FRAMES_COUNT)), lambda: fade_in(step + 1))
 
                 fade_in()  # 启动动画
 
@@ -103,7 +106,7 @@ class FluToolTip2(FluPopupWindow):
         self._widget.bind('<Leave>', self.hide, add="+")
         self._widget.bind('<Motion>', self.move, add="+")
 
-        #self.theme(mode)
+        self.theme(mode)
 
     def show(self, event: Event):
         self.popup(
@@ -127,7 +130,9 @@ class FluToolTip2(FluPopupWindow):
         self.configure(
             background=n["back_color"]
         )
-        self.wm_attributes("-transparentcolor", n["back_color"])
+
+        if sys.platform == "win32": # Only Windows supports the transparentcolor attribute
+            self.wm_attributes("-transparentcolor", n["back_color"])
         #print(n["back_color"])
         if hasattr(self, "_frame"):
             self._frame.dconfigure(

{tkfluent-0.1.2.dist-info → tkfluent-0.1.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: tkfluent
-Version: 0.1.2
-Summary: Fluent Design for Tkinter
+Version: 0.1.3
+Summary: Fluent(SunValley) Design for Tkinter. Modern GUI
 License: GPL-3.0
-Keywords: tkfluent,tksvg,tkinter,fluent,modern,UI,interface
+Keywords: tkfluent,tksvg,tkinter,fluent,modern,GUI,interface
 Author: XiangQinxi
 Author-email: xiangqinxi@outlook.com
 Requires-Python: >=3.8,<4.0
@@ -27,10 +27,10 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Tcl
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: easydict (>=1.13,<2.0)
-Requires-Dist: numpy (>=2.3.1,<3.0.0)
+Requires-Dist: numpy
 Requires-Dist: pillow (>=10.2.0,<11.0.0)
 Requires-Dist: svgwrite (>=1.4.3,<2.0.0)
-Requires-Dist: tkdeft (>=0.0.9,<0.0.10)
+Requires-Dist: tkdeft (==0.0.9)
 Requires-Dist: tkextrafont (>=0.6.3,<0.7.0)
 Requires-Dist: tksvg (>=0.7.4,<0.8.0)
 Project-URL: Documentation, https://tkfluent.netlify.app
@@ -44,10 +44,18 @@ Description-Content-Type: text/markdown
 ![Light.png](https://img.picui.cn/free/2025/06/22/6857e613bc150.png)
 ![Dark.png](https://img.picui.cn/free/2025/06/22/6857e613b7fc2.png)
 
+## 文档
+请查阅[tkfluent文档网站](https://tkfluent.netlify.app/)。
+使用`mkdocs`和`mkdocs-material`构建，由`netlify`部署
+
+## 贡献者
+1. [真_人工智障](https://github.com/TotoWang-hhh)
+
 ## 依赖图
 ```bash
 PS .\tkfluent> poetry show --tree                                                                                                                                                                                        
 easydict 1.13 Access dict values as attributes (works recursively).
+numpy 1.24.4 Fundamental package for array computing in Python
 pillow 10.4.0 Python Imaging Library (Fork)
 svgwrite 1.4.3 A Python library to create SVG drawings.
 tkdeft 0.0.9 使用tkinter+tksvg开发的现代化界面库

{tkfluent-0.1.2.dist-info → tkfluent-0.1.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
-tkflu/__init__.py,sha256=rw-h1nnCEP1mr_K9A7yAMdK5PS1yZRx3ha4q9AiYPlY,988
-tkflu/__main__.py,sha256=o7f_U4B2BvffR0XuUSKsEzS7xVsf6T6ifroxImH8-KE,3303
+tkflu/__init__.py,sha256=2h8-989xFYDdt2BAxVn0_6jkfq96Hy-0MfZnjm4Bacc,1013
+tkflu/__main__.py,sha256=QCVBJeyYGwtiMvS8wArcJrW8KL169w7wwXEBkjloGeM,3303
 tkflu/badge.py,sha256=p9kY-JbsDraohNg2ZJMk3xA4PS9LEKxFpaSGX_NgHBw,5836
-tkflu/button.py,sha256=ai5CuSSRdR8q4C7P8ngAyVCQij1uM75M2TCKaTwVhqI,13932
-tkflu/bwm.py,sha256=jKGzvvmMHWn5y7GNrsMmcxIpM5j5v3zwxkpnMpsrYLk,8009
+tkflu/button.py,sha256=N6wvcNNsqVf_Rb0c1ZOw3JpXqJcR9QJAFvjl2aaQXPw,19263
+tkflu/bwm.py,sha256=6N4fLxnMIAFVXdNriBk-88-rmCVu0j245zAjYA6Bq-k,8233
 tkflu/checkbox.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tkflu/constants.py,sha256=VX3NcSzdOqelK3IRM-fK_RKBHV26d8AgJMuP-8hqCsA,488
 tkflu/customwindow.py,sha256=Fr4CF0vKwj36tYzgX9_5F7OwcD59z9LfOW20Ugm2Hxc,3761
@@ -13,7 +13,7 @@ tkflu/demos/acrylic1.py,sha256=-1SniTxrQeAYz6VSxHu7UsAmZeSIBaElgC2KYVVAghU,423
 tkflu/demos/demo1.py,sha256=xR4a1qOrzxHXhVFlluTjp9izo7sO_YFbS_BGZj1LbZs,112
 tkflu/demos/designer.py,sha256=EI40war1G_XuXBrf9qKK0FJVGfS_WSsCwVBTSWxveeY,961
 tkflu/demos/grad.py,sha256=neRGPq7VkGEzzUJymNdBi7EYI55wMes-OX3l-DQSonA,2195
-tkflu/demos/grad2.py,sha256=U2PI1942CvfNGWXJ8WztW9LOg6tHIFcGrJNKfMl4Pf4,442
+tkflu/demos/grad2.py,sha256=2ZixYVCaqWoWxTqYD4p6x9Sz7VUT3KCeQDNzOX0aAkI,442
 tkflu/demos/grad3.py,sha256=vJQ70C0amAJMbDvudOvHBqwb59SuXoWDCk7QovFuFts,441
 tkflu/demos/test.py,sha256=DMontyt61qq4ULVExSrHA9tbQlXHH_KSkQPv1EV8TEk,153
 tkflu/demos/tooltip.py,sha256=_tTIUuVo8x9YpdikPLxTvbB3wF1vb-JKppVDgzHXj2k,286
@@ -35,24 +35,24 @@ tkflu/designs/text.py,sha256=YMJR2eGE7lFIZPYrT7p8QBD3zRH4NaVWhrL1dOb6vJ4,5059
 tkflu/designs/tooltip.py,sha256=OFUIO9-EMNjapF9zC5PuLW26HFGib-p800hNIxaWT5Q,442
 tkflu/designs/window.py,sha256=XHMvT0lVsJSeUApMf_bf9ipLSWT-BirkOiiUnVx-N48,625
 tkflu/entry.py,sha256=b4kblEEmZRqtuDM2E5_hhb_8MhTgujbwTNP7aICB6qM,10852
-tkflu/frame.py,sha256=XN2yTxzbwwQPiWj3RpCI5ndkYE7LEMWNlNbQaXE9L2U,11527
+tkflu/frame.py,sha256=oMy6fZcDfoYEZsGnKw23wlMAlojckavs7X6JbB8OQpw,11631
 tkflu/icons.py,sha256=Xzrc9WzexncYEPXqnVg3ywWv_7kLZLyYC5WtaRv30PQ,7129
-tkflu/image.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/label.py,sha256=sfLeYJP20604h8bgUKjbo7WnOJs-q41rTm1Tl3sMxec,2560
+tkflu/image.py,sha256=w5CbUBsn5KG8EekLwMyXC5T0w6E_dlP8tlKjnut9194,58
+tkflu/label.py,sha256=pt_xmL5cdrVwOMDGdbGdQKCwiCnsGp3OpMAG57Ow8Mw,2824
 tkflu/listbox.py,sha256=gD_oNNWVZtm5qXQ8bVBNRqJL6CGiIYtvhxztM9huzew,9991
 tkflu/litenav.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tkflu/menu.py,sha256=j15DzZuWGsG_xMvsDh7XfO-aV6zlF9AhzHN2rdjwQLU,3263
-tkflu/menubar.py,sha256=gm5zaNKM8_jbJ3SLJQZFJcOcR6-WAFG1MPKVyCO35j4,5765
+tkflu/menubar.py,sha256=MrqUzH5Znv92IkDGnZa4MEYZkH9ynfMzPNdx0JpQQwU,6145
 tkflu/popupmenu.py,sha256=dRwuFK7PKSYXiLhzrrzjKXTjtLfr7vh0KDvJIUjDetg,1592
 tkflu/popupwindow.py,sha256=OVDjW3g5oKeFy82SLz7XiNC2hy8RKeQGW2l0yBKezIs,1010
 tkflu/scrollbar.py,sha256=1hbu5n1mx4KyiF_M3sohpJJPux1zu5Jlw9V6LfQQs1Y,7293
 tkflu/slider.py,sha256=B29fNA0rGSWEdetFfwLEdNhYyprHEm9FCqU3Vpp08Sw,16114
-tkflu/text.py,sha256=OIh79R0NAJdle4aSsIxzdPhBNqiAw15FqtdEip-kU9s,10891
-tkflu/thememanager.py,sha256=xf8zIriAyGWzmSD-e1D7igW3uWvSZkIVoPi3YJ3Brj8,1897
-tkflu/togglebutton.py,sha256=ZOGJbZRs_vcw9s7rOuaGblKSpOCaj-ws7ZcX9vRMhZo,19831
-tkflu/tooltip.py,sha256=Cjid4E9yFFPBZwOz5uVhSb8kpEEW26Wv8vxiqc0bnw4,4917
+tkflu/text.py,sha256=OpGySgIpATrSR95cyhE-OTbtkBmQ3Eqqlw8DqVtioXI,12725
+tkflu/thememanager.py,sha256=2Vrkg0OEeTpwz0WU89IQCuN6VfhoUjI_N8vwth-W20A,1938
+tkflu/togglebutton.py,sha256=WWx6iFuNzvv8_1ujXEN2MwoHgo3itZHnVpeQeO6gqqQ,20355
+tkflu/tooltip.py,sha256=JDSqa2Q4kJmlnY5fu9kR0dlcexwvQoscomiaxw7BGQg,5163
 tkflu/toplevel.py,sha256=dPrnhHTiciJtrlsh5oZNuv77Q-YCRK6OgQQ0mrhfTeo,1382
 tkflu/window.py,sha256=2LjgL2KZIAYA04fXWQvfiNMYj_PKzlpSuEZrR94qHAs,1483
-tkfluent-0.1.2.dist-info/METADATA,sha256=lvU3Vw-ZIcpsOpBqgjX3LKnHAfKoD4MWxRcLxJlgqhs,37953
-tkfluent-0.1.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-tkfluent-0.1.2.dist-info/RECORD,,
+tkfluent-0.1.3.dist-info/METADATA,sha256=GomtMRLj71TsxHwvOo4oE8rHH7WGBHGk0WlPr2QOZ_M,38223
+tkfluent-0.1.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+tkfluent-0.1.3.dist-info/RECORD,,