tkfluent 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

tkflu/designs/text.py

@@ -23,7 +23,7 @@ def text(mode, state):
                 "radius": _r,
                 "text_color": "#646464",
                 "underline_fill": "#8a8a8a",
-                "underline_width": 1,
+                "underline_width": 1.4,
             }
         elif state == "hover":
             return {
@@ -42,7 +42,7 @@ def text(mode, state):
                 "radius": _r,
                 "text_color": "#626262",
                 "underline_fill": "#8a8a8a",
-                "underline_width": 1,
+                "underline_width": 1.4,
             }
         elif state == "pressed":
             return {
@@ -101,7 +101,7 @@ def text(mode, state):
                 "radius": _r,
                 "text_color": "#d1d1d1",
                 "underline_fill": "#989898",
-                "underline_width": 1,
+                "underline_width": 1.4,
             }
         elif state == "hover":
             return {
@@ -121,7 +121,7 @@ def text(mode, state):
                 "text_color": "#d2d2d2",
 
                 "underline_fill": "#989898",
-                "underline_width": 1,
+                "underline_width": 1.4,
             }
         elif state == "pressed":
             return {
@@ -160,5 +160,5 @@ def text(mode, state):
                 "radius": _r,
                 "text_color": "#757575",
                 "underline_fill": None,
-                "underline_width": 1,
+                "underline_width": 1.4,
             }

tkflu/designs/window.py

@@ -7,7 +7,8 @@ def window(mode):
                 "back_color": "#cf392d",
                 "text_color": "#000000",
                 "text_hover_color": "#ffffff"
-            }
+            },
+            "transparent_color": "grey"
         }
     else:
         return {
@@ -17,5 +18,6 @@ def window(mode):
                 "back_color": "#c42b1c",
                 "text_color": "#ffffff",
                 "text_hover_color": "#000000"
-            }
+            },
+            "transparent_color": "grey"
         }

tkflu/entry.py

@@ -54,7 +54,7 @@ class FluEntryCanvas(DCanvas):
     draw = FluEntryDraw
 
     def create_round_rectangle(self,
-                               x1, y1, x2, y2, r1, r2=None, temppath=None,
+                               x1, y1, x2, y2, r1, r2=None, temppath=None, temppath2=None,
                                fill="transparent", fill_opacity=1, stop1="0.93", stop2="0.94",
                                outline="black", outline2="black", outline_opacity=1, outline2_opacity=1,
                                width=1
@@ -65,7 +65,8 @@ class FluEntryCanvas(DCanvas):
             outline=outline, outline2=outline2, outline_opacity=outline_opacity, outline2_opacity=outline2_opacity,
             width=width
         )
-        self._tkimg = self.svgdraw.create_tksvg_image(self._img)
+        from .designs.renderer import get_renderer
+        self._tkimg = self.svgdraw.create_svg_image(self._img, temppath2, way=get_renderer())
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
 
     create_roundrect = create_round_rectangle
@@ -168,9 +169,12 @@ class FluEntry(FluEntryCanvas, DDrawWidget, FluToolTipBase):
 
         self.entry.configure(background=_back_color, insertbackground=_text_color, foreground=_text_color,
                              disabledbackground=_back_color, disabledforeground=_text_color)
-
+        from .designs.renderer import get_renderer
+        if get_renderer() == 1:
+            width -= 1
+            height -= 1
         self.element_border = self.create_round_rectangle(
-            0, 0, width, height, _radius, temppath=self.temppath,
+            0, 0, width, height, _radius, temppath=self.temppath, temppath2=self.temppath3,
             fill=_back_color, fill_opacity=_back_opacity, stop1=_stop1, stop2=_stop2,
             outline=_border_color, outline_opacity=_border_color_opacity, outline2=_border_color2,
             outline2_opacity=_border_color2_opacity,

tkflu/frame.py

@@ -110,7 +110,8 @@ class FluFrameCanvas(DCanvas):
             fill=fill,  #fill_opacity=fill_opacity,
             outline=outline, outline_opacity=outline_opacity, width=width
         )
-        self._tkimg = self.svgdraw.create_tksvg_image(self._img)
+        from .designs.renderer import get_renderer
+        self._tkimg = self.svgdraw.create_svg_image(self._img)
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
 
     create_roundrect = create_round_rectangle
@@ -194,7 +195,7 @@ class FluFrame(Frame, DObject, FluGradient):
                 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])
+                        #print(back_colors[ii])
                         self._draw(tempcolor=back_colors[ii])
                         self.update()
 

tkflu/label.py

@@ -67,14 +67,17 @@ class FluLabel(DDrawWidget, FluToolTipBase, FluGradient):
             from .designs.animation import get_animation_step_time
             animation_step_time = get_animation_step_time()
 
-        if hasattr(self, "tk"):
-            if self.attributes.text_color != m["text_color"]:
-                text_colors = self.generate_hex2hex(self.attributes.text_color, m["text_color"], steps=animation_steps)
-                for i in range(animation_steps):
-                    def update(ii=i):  # 使用默认参数立即捕获i的值
-                        self._draw(tempcolor=text_colors[ii])
-
-                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+        if not animation_steps == 0 or not animation_step_time == 0:
+            if hasattr(self, "tk"):
+                if self.attributes.text_color != m["text_color"]:
+                    text_colors = self.generate_hex2hex(self.attributes.text_color, m["text_color"], steps=animation_steps)
+                    for i in range(animation_steps):
+                        def update(ii=i):  # 使用默认参数立即捕获i的值
+                            self._draw(tempcolor=text_colors[ii])
+
+                        self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
         self.dconfigure(
             text_color=m["text_color"]
         )
+        if hasattr(self, "tk"):
+            self._draw()

tkflu/listbox.py

@@ -40,7 +40,7 @@ class FluListBoxCanvas(DCanvas):
             x1, y1, x2, y2, r1, r2, temppath=temppath,
             fill=fill, outline=outline, outline2=outline2, width=width
         )
-        self._tkimg = self.svgdraw.create_tksvg_image(self._img)
+        self._tkimg = self.svgdraw.create_svg_image(self._img)
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
 
     create_roundrect = create_round_rectangle

tkflu/menu.py

@@ -4,7 +4,7 @@ from .tooltip import FluToolTipBase
 
 
 class FluMenu(FluPopupMenu, FluToolTipBase):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, height=None, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def _init(self, mode, style):
@@ -25,16 +25,14 @@ class FluMenu(FluPopupMenu, FluToolTipBase):
 
         self.theme(mode=mode, style=style)
 
-    def add_command(self, custom_widget=None, width=40, **kwargs):
+    def add_command(self, custom_widget=None, width=None, label: str = "", **kwargs):
+        if width is None:
+            width = len(label)*8
         if custom_widget:
             widget = custom_widget(self)
         else:
             from .button import FluButton
             widget = FluButton(self, width=width)
-        if "label" in kwargs:
-            label = kwargs.pop("label")
-        else:
-            label = ""
         if "style" in kwargs:
             style = kwargs.pop("style")
         else:
@@ -66,16 +64,14 @@ class FluMenu(FluPopupMenu, FluToolTipBase):
         widget.pack(side="top", fill="x", padx=1, pady=(1, 0))
         self.dcget("actions")[id] = widget
 
-    def add_cascade(self, custom_widget=None, width=40, menu=None, **kwargs):
+    def add_cascade(self, custom_widget=None, width=None, menu=None, label: str = "", **kwargs):
+        if width is None:
+            width = len(label)*8
         if custom_widget:
             widget = custom_widget(self)
         else:
             from .button import FluButton
             widget = FluButton(self, width=width)
-        if "label" in kwargs:
-            label = kwargs.pop("label")
-        else:
-            label = ""
         if "style" in kwargs:
             style = kwargs.pop("style")
         else:
@@ -86,9 +82,13 @@ class FluMenu(FluPopupMenu, FluToolTipBase):
             id = widget._w
 
         def command(event=None):
+            self.l1 = True
             #print(menu._w)
 
-            menu.popup(widget.winfo_rootx()+widget.winfo_width()+self.winfo_width(), widget.winfo_rooty())
+            menu.popup(widget.winfo_rootx()+widget.winfo_width(), widget.winfo_rooty()-5)
+            height = len(self.dcget("actions")) * 45
+            #print(height)
+            menu.window.geometry(f"100x{height}")
             menu.window.deiconify()
             menu.window.attributes("-topmost")
 
@@ -102,4 +102,4 @@ class FluMenu(FluPopupMenu, FluToolTipBase):
             widget.theme(style=style)
 
         widget.pack(side="top", fill="x", padx=1, pady=(1, 0))
-        self.dcget("actions")[id] = widget
+        self.dcget("actions")[id] = widget

tkflu/menubar.py

@@ -20,6 +20,7 @@ class FluMenuBar(Frame, DObject, FluGradient):
         self.attributes = EasyDict(
             {
                 "back_color": "#f3f3f3",
+                "border_color": "#e5e5e5",
 
                 "actions": {}
             }
@@ -30,16 +31,14 @@ class FluMenuBar(Frame, DObject, FluGradient):
     def show(self):
         self.pack(fill="x")
 
-    def add_command(self, custom_widget=None, width=40, **kwargs):
+    def add_command(self, custom_widget=None, width=None, label: str = "", **kwargs):
+        if width is None:
+            width = len(label)*8
         if custom_widget:
             widget = custom_widget(self)
         else:
             from .button import FluButton
             widget = FluButton(self, width=width)
-        if "label" in kwargs:
-            label = kwargs.pop("label")
-        else:
-            label = ""
         if "style" in kwargs:
             style = kwargs.pop("style")
         else:
@@ -68,16 +67,14 @@ class FluMenuBar(Frame, DObject, FluGradient):
 
     from .menu import FluMenu
 
-    def add_cascade(self, custom_widget=None, width=40, menu: FluMenu = None, **kwargs):
+    def add_cascade(self, custom_widget=None, width=None, label: str = "", menu: FluMenu = None, **kwargs):
+        if width is None:
+            width = len(label)*8
         if custom_widget:
             widget = custom_widget(self)
         else:
             from .button import FluButton
             widget = FluButton(self, width=width)
-        if "label" in kwargs:
-            label = kwargs.pop("label")
-        else:
-            label = ""
         if "style" in kwargs:
             style = kwargs.pop("style")
         else:
@@ -89,7 +86,9 @@ class FluMenuBar(Frame, DObject, FluGradient):
 
         def command():
             menu.focus_set()
-            menu.popup(widget.winfo_rootx(), widget.winfo_rooty() + widget.winfo_height())
+            menu.popup(widget.winfo_rootx()-5, widget.winfo_rooty() + widget.winfo_height())
+            height = len(menu.dcget("actions")) * 45
+            menu.window.geometry(f"100x{height}")
             menu.window.deiconify()
             menu.window.attributes("-topmost")
 
@@ -144,31 +143,32 @@ class FluMenuBar(Frame, DObject, FluGradient):
             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
+                    border_colors = self.generate_hex2hex(self.attributes.border_color, m["border_color"],
+                                                          steps=animation_steps)
                 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()
+                    border_colors = self.generate_hex2hex(self.attributes.border_color, m["border_color"],
+                                                          steps=animation_steps)
+                for i in range(animation_steps):
+                    def update(ii=i):  # 使用默认参数立即捕获i的值
+                        self.dconfigure(back_color=back_colors[ii], border_color=border_colors[ii])
+                        self._draw()
 
-                        self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
+                    self.after(i * animation_step_time, update)  # 直接传递函数，不需要lambda
 
                 self.after(animation_steps * animation_step_time + 50, lambda: self.update_children())
             else:
-                if mode.lower() == "dark":
-                    self.dconfigure(back_color=m["back_color"])
-                else:
-                    self.dconfigure(back_color=m["back_color"])
+                self.dconfigure(back_color=m["back_color"])
+                self.dconfigure(border_color=m["border_color"])
                 self._draw()
 
     def _draw(self, event=None):
         self.config(background=self.attributes.back_color)
+        if not hasattr(self, "border"):
+            self.border = Frame(self, height=1.2, background=self.attributes.border_color)
+        else:
+            self.border.configure(background=self.attributes.border_color)
+        self.border.pack(fill="x", expand="yes", side="bottom")
 
     def _event_configure(self, event=None):
         self._draw(event)

tkflu/popupmenu.py

@@ -8,7 +8,7 @@ class FluPopupMenuWindow(FluPopupWindow):
 
 
 class FluPopupMenu(FluFrame):
-    def __init__(self, *args, width=100, height=46, transparent_color="#ffefa2", style="popupmenu", **kwargs):
+    def __init__(self, *args, width=100, height=46, transparent_color=None, style="popupmenu", **kwargs):
         self.window = FluPopupMenuWindow(transparent_color=transparent_color, width=width, height=height)
 
         super().__init__(self.window, *args, style=style, **kwargs)

tkflu/popupwindow.py

@@ -1,23 +1,40 @@
 from tkinter import Toplevel
 
+from vbuild import hasSass
+
 
 class FluPopupWindow(Toplevel):
-    def __init__(self, *args, transparent_color="#ebebeb", mode="light", width=100, height=46, custom=True, **kwargs):
+    def __init__(self, *args, transparent_color=None, mode="light", width=100, height=46, custom=True, **kwargs):
         super().__init__(*args, background=transparent_color, **kwargs)
 
         self.theme(mode=mode)
 
+        self._transparent_color = transparent_color
+
         if width > 0 and height > 0:
             self.geometry(f"{width}x{height}")
 
         if custom:
-            self.transient_color = transparent_color
             self.overrideredirect(True)
-            self.wm_attributes("-transparentcolor", transparent_color)
+
+            self._draw()
 
         self.withdraw()
 
         self.bind("<FocusOut>", self._event_focusout, add="+")
+        self.bind("<Configure>", self._draw)
+
+    def _draw(self, event=None):
+        if hasattr(self, "tk"):
+            if self.overrideredirect():
+                if self._transparent_color is None:
+                    from .designs.window import window
+                    self.transparent_color = window(self.mode)["transparent_color"]
+                else:
+                    self.transparent_color =  self._transparent_color
+                #print(self.transparent_color)
+                self.wm_attributes("-transparentcolor", self.transparent_color)
+                self.configure(background=self.transparent_color)
 
     def _event_focusout(self, event=None):
         """self.wm_attributes("-alpha", 1)
@@ -39,28 +56,35 @@ class FluPopupWindow(Toplevel):
         self.withdraw()
 
     def popup(self, x, y):
-        self.geometry(f"+{x}+{y}")
-        #self.focus_set()
-        self.wm_attributes("-alpha", 0.0)
-        self.deiconify()
 
         from .designs.animation import get_animation_steps, get_animation_step_time
 
         FRAMES_COUNT = get_animation_steps()
         FRAME_DELAY = get_animation_step_time()
 
-        def fade_in(step=0):
-            alpha = step / FRAMES_COUNT  # 按帧数变化，从0到1
-            self.wm_attributes("-alpha", alpha)
-            if step < FRAMES_COUNT:
-                # 每执行一次，增加一次透明度，间隔由帧数决定
-                self.after(int(round(FRAME_DELAY*FRAMES_COUNT / FRAMES_COUNT)), lambda: fade_in(step + 1))
+        #print(FRAMES_COUNT,FRAME_DELAY)
+
+        self.geometry(f"+{x}+{y}")
+        #self.focus_set()
+        if FRAMES_COUNT != 0 or FRAME_DELAY != 0:
+            self.wm_attributes("-alpha", 0.0)
+            self.deiconify()
+
+            def fade_in(step=0):
+                alpha = step / FRAMES_COUNT  # 按帧数变化，从0到1
+                self.wm_attributes("-alpha", alpha)
+                if step < FRAMES_COUNT:
+                    # 每执行一次，增加一次透明度，间隔由帧数决定
+                    self.after(int(round(FRAME_DELAY*FRAMES_COUNT / FRAMES_COUNT)), lambda: fade_in(step + 1))
 
-        fade_in()  # 启动动画
+            fade_in()  # 启动动画
+        else:
+            self.deiconify()
 
     def theme(self, mode=None):
         if mode:
             self.mode = mode
+            self._draw()
         for widget in self.winfo_children():
             if hasattr(widget, "theme"):
                 widget.theme(mode=self.mode.lower())