tkfluent 0.1.5__tar.gz → 0.1.6__tar.gz

{tkfluent-0.1.5 → tkfluent-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tkfluent
-Version: 0.1.5
+Version: 0.1.6
 Summary: Fluent(SunValley) Design for Tkinter. Modern GUI
 License: GPL-3.0
 Keywords: tkfluent,tksvg,tkinter,fluent,modern,GUI,interface
@@ -30,7 +30,7 @@ Requires-Dist: easydict (>=1.13,<2.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.1.1)
+Requires-Dist: tkdeft (==0.1.2)
 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

{tkfluent-0.1.5 → tkfluent-0.1.6}/pyproject.toml

@@ -1,12 +1,13 @@
 [tool.poetry]
 name = "tkfluent"
-version = "0.1.5"
+version = "0.1.6"
 description = "Fluent(SunValley) Design for Tkinter. Modern GUI"
 authors = ["XiangQinxi <xiangqinxi@outlook.com>"]
 readme = "README.md"
 documentation = "https://tkfluent.netlify.app"
 packages = [
-    { include = "tkflu" }
+    { include = "tkflu" },
+    #{ include = "tkflux" }
 ]
 license = "GPL-3.0"
 keywords = [ "tkfluent", "tksvg", "tkinter", "fluent", "modern", "GUI", "interface" ]
@@ -36,7 +37,7 @@ tksvg = "^0.7.4"
 tkextrafont = "^0.6.3"
 svgwrite = "^1.4.3"
 pillow = "^10.2.0"
-tkdeft = "0.1.1"
+tkdeft = "0.1.2"
 easydict = "^1.13"
 numpy = "*"
 

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/__main__.py

@@ -3,8 +3,9 @@ from tkinter import *
 from tkinter.font import *
 
 blue_primary_color()
-set_animation_steps(10)
-set_animation_step_time(20)
+set_animation_steps(0)
+set_animation_step_time(0)
+set_renderer(0)
 
 def togglestate():
     if button1.dcget("state") == NORMAL:
@@ -38,32 +39,35 @@ thememanager = FluThemeManager()
 
 menubar = FluMenuBar(root)
 menubar.add_command(
-    label="FluMenu1", width=80, command=lambda: print("FluMenu1 -> Clicked")
+    label="FluMenu1", command=lambda: print("FluMenu1 -> Clicked")
 )
 
 menu1 = FluMenu()
 menu1.add_command(
-    label="FluMenu2-1", width=80, command=lambda: print("FluMenu2-1 -> Clicked")
+    label="FluMenu2-1", command=lambda: print("FluMenu2-1 -> Clicked")
 )
 menubar.add_cascade(
-    label="FluMenu2", width=80, menu=menu1
+    label="FluMenu2", menu=menu1
 )
 
 menu2 = FluMenu(height=93)
 menu2.add_command(
-    label="FluMenu3-1", width=80, command=lambda: print("FluMenu3-1 -> Clicked")
+    label="FluMenu3-1", command=lambda: print("FluMenu3-1 -> Clicked")
 )
 
-menu3 = FluMenu(height=46, width=10)
+menu3 = FluMenu(height=93)
 menu3.add_command(
-    label="FluMenu3-2-1", width=80, command=lambda: print("FluMenu3-2-1 -> Clicked")
+    label="FluMenu3-2-1", command=lambda: print("FluMenu3-2-1 -> Clicked")
+)
+menu3.add_command(
+    label="FluMenu3-2-2", command=lambda: print("FluMenu3-2-2 -> Clicked")
 )
 
 menu2.add_cascade(
-    label="FluMenu3-2", width=80, menu=menu3
+    label="FluMenu3-2", menu=menu3
 )
 menubar.add_cascade(
-    label="FluMenu3", width=80, menu=menu2
+    label="FluMenu3", menu=menu2
 )
 
 menubar.pack(fill="x")
@@ -118,7 +122,7 @@ entry1.pack(fill="x", padx=5, pady=5)
 text1 = FluText(frame)
 text1.pack(fill="x", padx=5, pady=5)
 
-slider1 = FluSlider(frame, value=5, min=0, max=10, tick=False, changed=lambda: print(f"FluSlider -> Changed -> Value: {slider1.dcget('value')}"))
+slider1 = FluSlider(frame, value=5, min=0, max=10, tick=True, changed=lambda: print(f"FluSlider -> Changed -> Value: {slider1.dcget('value')}"))
 slider1.pack(fill="x", padx=5, pady=5)
 
 """listbox1 = FluListBox(frame)

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/badge.py

@@ -36,7 +36,7 @@ class FluBadgeCanvas(DCanvas):
     draw = FluBadgeDraw
 
     def create_round_rectangle(self,
-                               x1, y1, x2, y2, temppath=None,
+                               x1, y1, x2, y2, temppath=None, temppath2=None,
                                fill="transparent", fill_opacity=1,
                                outline="black", outline_opacity=1, width=1
                                ):
@@ -45,7 +45,10 @@ class FluBadgeCanvas(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, temppath2, way=get_renderer())
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
 
     create_roundrect = create_round_rectangle
@@ -130,9 +133,14 @@ class FluBadge(FluBadgeCanvas, DDrawWidget, FluToolTipBase):
         _border_color_opacity = self.attributes.border_color_opacity
         _border_width = self.attributes.border_width
         _text_color = self.attributes.text_color
-
+        from .designs.renderer import get_renderer
+        width = self.winfo_width()
+        height = self.winfo_height()
+        if get_renderer() == 1:
+            width -= 1
+            height -= 1
         self.element_border = self.create_round_rectangle(
-            0, 0, self.winfo_width(), self.winfo_height(), temppath=self.temppath,
+            0, 0, width, height, temppath=self.temppath, temppath2=self.temppath3,
             fill=_back_color, fill_opacity=_back_opacity,
             outline=_border_color, outline_opacity=_border_color_opacity, width=_border_width
         )

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/button.py

@@ -72,7 +72,7 @@ class FluButtonCanvas(DCanvas):
 
     def create_round_rectangle(self,
                                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,
+                               r1: Union[int, float], r2: Union[int, float] = None, temppath: Union[str, None] = None, temppath2: 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,
@@ -105,7 +105,10 @@ class FluButtonCanvas(DCanvas):
             outline=outline, outline2=outline2, outline_opacity=outline_opacity, outline2_opacity=outline2_opacity,
             width=width,
         )  # 创建个svg圆角矩形图片
-        self._tkimg = self.svgdraw.create_tksvg_image(self._img)  # 用tksvg读取svg图片
+        from .designs.renderer import get_renderer
+
+        self._tkimg = self.svgdraw.create_svg_image(path=self._img, path2=temppath2, way=get_renderer())  # 用tksvg读取svg图片
+        #print(self._img)
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg, *args, **kwargs)  # 在画布上创建个以svg图片为图片的元件
 
     create_roundrect = create_round_rectangle  # 缩写
@@ -246,8 +249,14 @@ class FluButton(FluButtonCanvas, DDrawWidget, FluToolTipBase, FluGradient):
         if hasattr(self, "element_border"):
             self.delete(self.element_border)
 
+        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,
             outline=_border_color, outline_opacity=_border_color_opacity, outline2=_border_color2,
             outline2_opacity=_border_color2_opacity,

tkfluent-0.1.6/tkflu/demos/demo.py

@@ -0,0 +1,137 @@
+def run():
+    from tkflu import *
+    from tkinter import *
+    from tkinter.font import *
+
+    blue_primary_color()
+    set_animation_steps(0)
+    set_animation_step_time(0)
+
+    def togglestate():
+        if button1.dcget("state") == NORMAL:
+            button1.dconfigure(state=DISABLED)
+            button2.dconfigure(state=DISABLED)
+            entry1.dconfigure(state=DISABLED)
+            text1.dconfigure(state=DISABLED)
+            togglebutton1.dconfigure(state=DISABLED)
+            slider1.dconfigure(state=DISABLED)
+        else:
+            button1.dconfigure(state=NORMAL)
+            button2.dconfigure(state=NORMAL)
+            entry1.dconfigure(state=NORMAL)
+            text1.dconfigure(state=NORMAL)
+            togglebutton1.dconfigure(state=NORMAL)
+            slider1.dconfigure(state=NORMAL)
+        button1._draw()
+        button2._draw()
+        entry1._draw()
+        text1._draw()
+        togglebutton1._draw()
+        slider1._draw()
+
+    root = FluWindow()
+    #root.wincustom(way=0)
+    root.geometry("360x650")
+
+    popupmenu = FluPopupMenu()
+
+    thememanager = FluThemeManager()
+
+    menubar = FluMenuBar(root)
+    menubar.add_command(
+        label="FluMenu1", command=lambda: print("FluMenu1 -> Clicked")
+    )
+
+    menu1 = FluMenu()
+    menu1.add_command(
+        label="FluMenu2-1", command=lambda: print("FluMenu2-1 -> Clicked")
+    )
+    menubar.add_cascade(
+        label="FluMenu2", menu=menu1
+    )
+
+    menu2 = FluMenu(height=93)
+    menu2.add_command(
+        label="FluMenu3-1", command=lambda: print("FluMenu3-1 -> Clicked")
+    )
+
+    menu3 = FluMenu(height=93)
+    menu3.add_command(
+        label="FluMenu3-2-1", command=lambda: print("FluMenu3-2-1 -> Clicked")
+    )
+    menu3.add_command(
+        label="FluMenu3-2-2", command=lambda: print("FluMenu3-2-2 -> Clicked")
+    )
+
+    menu2.add_cascade(
+        label="FluMenu3-2", menu=menu3
+    )
+    menubar.add_cascade(
+        label="FluMenu3", menu=menu2
+    )
+
+    menubar.pack(fill="x")
+
+    frame = FluFrame(root)
+
+    scrollbar1 = FluScrollBar(frame)
+    scrollbar1.pack(fill="y", side="right", padx=5, pady=5)
+
+    badge1 = FluBadge(frame, text="FluBadge", width=60)
+    badge1.pack(padx=5, pady=5)
+
+    badge2 = FluBadge(frame, text="FluBadge (Accent)", width=120, style="accent")
+    badge2.pack(padx=5, pady=5)
+
+    label1 = FluLabel(frame, text="FluLabel(Hover Me)")
+    label1.tooltip(text="FluToolTip")
+    label1.pack(padx=5, pady=5)
+
+    label2 = FluLabel(frame, text="FluLabel2(Hover Me)")
+    label2.tooltip(text="FluToolTip2", way=1)
+    label2.pack(padx=5, pady=5)
+
+    button1 = FluButton(
+        frame, text="FluButton", command=lambda: print("FluButton -> Clicked")
+    )
+    button1.pack(fill="x", padx=5, pady=5)
+
+    button2 = FluButton(
+        frame, text="FluButton (Accent)", command=lambda: print("FluButton (Accent) -> Clicked"), style="accent"
+    )
+    button2.pack(fill="x", padx=5, pady=5)
+
+    togglebutton1 = FluToggleButton(
+        frame, text="FluToggleButton", command=lambda: print(f"FluToggleButton -> Toggled -> Checked: {togglebutton1.dcget('checked')}")
+    )
+    togglebutton1.pack(fill="x", padx=5, pady=5)
+
+    togglebutton2 = FluToggleButton(
+        frame, text="Toggle Theme", command=lambda: toggle_theme(togglebutton2, thememanager)
+    )
+    togglebutton2.pack(fill="x", padx=5, pady=5)
+
+    togglebutton3 = FluToggleButton(
+        frame, text="Toggle State", command=lambda: togglestate()
+    )
+    togglebutton3.pack(fill="x", padx=5, pady=5)
+
+    entry1 = FluEntry(frame)
+    entry1.pack(fill="x", padx=5, pady=5)
+
+    text1 = FluText(frame)
+    text1.pack(fill="x", padx=5, pady=5)
+
+    slider1 = FluSlider(frame, value=5, min=0, max=10, tick=True, changed=lambda: print(f"FluSlider -> Changed -> Value: {slider1.dcget('value')}"))
+    slider1.pack(fill="x", padx=5, pady=5)
+
+    """listbox1 = FluListBox(frame)
+    listbox1.dconfigure()
+    listbox1.pack(fill="x", padx=5, pady=5)"""
+
+    frame.pack(fill="both", expand="yes", side="right", padx=15, pady=15)
+    #frame.update_idletasks()
+
+    #thememanager.mode("light")
+
+    root.mainloop()

tkfluent-0.1.6/tkflu/demos/designer.py

@@ -0,0 +1,48 @@
+from tkflu import *
+
+set_renderer(1)
+set_animation_steps(10)
+set_animation_step_time(10)
+
+root = FluWindow()
+root.title("tkfluent designer")
+root.geometry("600x300")
+
+theme_manager = FluThemeManager(root)
+
+menubar = FluMenuBar(root)
+
+menu1 = FluMenu()
+menu1.geometry("90x90")
+menu1.add_command(label="Light", command=lambda: theme_manager.mode("light"))
+menu1.add_command(label="Dark", command=lambda: theme_manager.mode("dark"))
+
+def func1():
+    messagebox = FluToplevel()
+    messagebox.geometry("300x200")
+
+    label = FluLabel(messagebox, text="This is a example for tkfluent!", width=160, height=32)
+    label.pack(anchor="center")
+
+style = "menu"
+
+menubar.add_command(label="File", style=style, width=40, command=lambda: print("File -> Clicked"))
+menubar.add_cascade(label="Theme Mode", style=style, width=85, menu=menu1)
+menubar.add_command(label="About", style=style, width=45, command=lambda: func1())
+
+menubar.show()
+
+widgets = FluFrame(root, width=100)
+
+widgets.title = FluLabel(widgets, text="Widgets", width=100)
+widgets.title.pack(fill="x", side="top")
+
+widgets.pack(fill="y", side="left", padx=10, pady=10)
+
+windows = FluFrame(root, width=300)
+windows.pack(fill="y", side="left", expand="yes", anchor="center", padx=10, pady=10)
+
+configs = FluFrame(root, width=200)
+configs.pack(fill="y", side="right", padx=10, pady=10)
+
+root.mainloop()

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/designs/__init__.py

@@ -2,4 +2,5 @@ from .design import FluDesign
 from .primary_color import FluPrimaryColor, set_primary_color, get_primary_color
 from .animation import FluAnimation, set_animation_steps, set_animation_step_time, get_animation_steps, get_animation_step_time
 from .gradient import FluGradient
-from .fonts import *
+from .fonts import *
+from .renderer import FluRenderer, set_renderer, get_renderer

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/designs/button.py

@@ -120,8 +120,8 @@ def button(mode: str, style: str, state: str):
                 }
             elif state == "hover":
                 return {
-                    "back_color": "#F9F9F9",
-                    "back_opacity": 0,
+                    "back_color": "#eaeaea",
+                    "back_opacity": "1",
                     "border_color": "#000000",
                     "border_color_opacity": "0",
                     "border_color2": None,
@@ -132,8 +132,8 @@ def button(mode: str, style: str, state: str):
                 }
             elif state == "pressed":
                 return {
-                    "back_color": "#F9F9F9",
-                    "back_opacity": "0.3",
+                    "back_color": "#ededed",
+                    "back_opacity": "1",
                     "border_color": "#000000",
                     "border_color_opacity": "0",
                     "border_color2": None,

tkfluent-0.1.6/tkflu/designs/renderer.py

@@ -0,0 +1,19 @@
+from os import environ
+
+
+def set_renderer(way: int):
+    environ["tkfluent.renderer"] = str(way)
+
+def get_renderer():
+    return int(environ["tkfluent.renderer"])
+
+if "tkfluent.renderer" not in environ:
+    set_renderer(0)
+
+
+class FluRenderer(object):
+    def renderer(self, way: int = None):
+        if way:
+            environ["tkfluent.renderer"] = str(way)
+        else:
+            return int(environ["tkfluent.renderer"])

{tkfluent-0.1.5 → tkfluent-0.1.6}/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"
         }

{tkfluent-0.1.5 → tkfluent-0.1.6}/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,

{tkfluent-0.1.5 → tkfluent-0.1.6}/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()
 

{tkfluent-0.1.5 → tkfluent-0.1.6}/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

{tkfluent-0.1.5 → tkfluent-0.1.6}/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

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/menubar.py

@@ -31,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:
@@ -69,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:
@@ -90,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")
 

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/popupmenu.py

@@ -8,7 +8,7 @@ class FluPopupMenuWindow(FluPopupWindow):
 
 
 class FluPopupMenu(FluFrame):
-    def __init__(self, *args, width=100, height=46, transparent_color="gray", 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)

{tkfluent-0.1.5 → tkfluent-0.1.6}/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)
@@ -45,9 +62,11 @@ class FluPopupWindow(Toplevel):
         FRAMES_COUNT = get_animation_steps()
         FRAME_DELAY = get_animation_step_time()
 
+        #print(FRAMES_COUNT,FRAME_DELAY)
+
         self.geometry(f"+{x}+{y}")
         #self.focus_set()
-        if not FRAMES_COUNT == 0 or not FRAME_DELAY == 0:
+        if FRAMES_COUNT != 0 or FRAME_DELAY != 0:
             self.wm_attributes("-alpha", 0.0)
             self.deiconify()
 
@@ -65,6 +84,7 @@ class FluPopupWindow(Toplevel):
     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())

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/scrollbar.py

@@ -57,7 +57,7 @@ class FluScrollBarCanvas(DCanvas):
             x1, y1, x2, y2, r1, r2, temppath=temppath,
             fill=fill
         )
-        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)
 
     def create_thumb(
@@ -69,7 +69,7 @@ class FluScrollBarCanvas(DCanvas):
             x1, y1, x2, y2, r1, r2, temppath=temppath,
             fill=fill
         )
-        self._tkimg2 = self.svgdraw.create_tksvg_image(self._img2)
+        self._tkimg2 = self.svgdraw.create_svg_image(self._img2)
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg2)
 
 

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/slider.py

@@ -82,7 +82,7 @@ class FluSliderCanvas(DCanvas):
 
     def create_track(
             self,
-            x1, y1, width, height, width2, temppath=None, radius=3,
+            x1, y1, width, height, width2, temppath=None, temppath2=None, radius=3,
             track_fill="transparent", track_opacity=1,
             rail_fill="transparent", rail_opacity=1
     ):
@@ -91,13 +91,14 @@ class FluSliderCanvas(DCanvas):
             track_fill=track_fill, track_opacity=track_opacity,
             rail_fill=rail_fill, rail_opacity=rail_opacity
         )
-        self._tkimg2 = self.svgdraw.create_tksvg_image(self._img2)
+        from .designs.renderer import get_renderer
+        self._tkimg2 = self.svgdraw.create_svg_image(self._img2, temppath2, way=get_renderer())
         #print(self._img2)
         return self.create_image(x1, y1, anchor="nw", image=self._tkimg2)
 
     def create_thumb(
             self,
-            x1, y1, width, height, r1, r2, temppath=None,
+            x1, y1, width, height, r1, r2, temppath=None, temppath2=None,
             fill="transparent", fill_opacity=1,
             outline="transparent", outline_opacity=1,
             outline2="transparent", outline2_opacity=1,
@@ -110,7 +111,8 @@ class FluSliderCanvas(DCanvas):
             outline2=outline2, outline2_opacity=outline2_opacity,
             inner_fill=inner_fill, inner_fill_opacity=inner_fill_opacity,
         )
-        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)
 
 
@@ -286,28 +288,53 @@ class FluSlider(FluSliderCanvas, DDrawWidget):
 
             # 确保不会超出右边界
             thumb_left = min(thumb_left, self.winfo_width() - thumb_width)
+            from .designs.renderer import get_renderer
+            if get_renderer() == 0:
+                # 创建轨道时，width2 参数应为选中部分的宽度（滑块中心位置）
+                self.element_track = self.create_track(
+                    _thumb_width / 4,
+                    height / 2 - _track_height,
+                    self.winfo_width() - _thumb_width / 2,
+                    _track_height,
+                    thumb_center - _thumb_width / 4,  # 关键修正：使用滑块中心相对于轨道起点的距离
+                    temppath=self.temppath, temppath2=self.temppath3, radius=_radius,
+                    track_fill=_track_back_color, track_opacity=_track_back_opacity,
+                    rail_fill=_rail_back_color, rail_opacity=_rail_back_opacity
+                )
+
+                self.element_thumb = self.create_thumb(
+                    thumb_left, 0,  # 直接使用计算出的左上角位置
+                    thumb_width, thumb_width,
+                    _thumb_radius, _thumb_inner_radius,
+                    temppath=self.temppath2, temppath2=self.temppath4, fill=_thumb_back_color, fill_opacity=_thumb_back_opacity,
+                    outline=_thumb_border_color, outline_opacity=_thumb_border_color_opacity,
+                    outline2=_thumb_border_color2, outline2_opacity=_thumb_border_color2_opacity,
+                    inner_fill=_thumb_inner_back_color, inner_fill_opacity=_thumb_inner_back_opacity,
+                )
+            elif get_renderer() == 1:
+                # 创建轨道时，width2 参数应为选中部分的宽度（滑块中心位置）
+                self.element_track = self.create_track(
+                    _thumb_width / 4,
+                    height / 2 - _track_height,
+                    self.winfo_width() - _thumb_width / 2 - 1,
+                    _track_height - 1,
+                    thumb_center - _thumb_width / 4,  # 关键修正：使用滑块中心相对于轨道起点的距离
+                    temppath=self.temppath, temppath2=self.temppath3, radius=_radius,
+                    track_fill=_track_back_color, track_opacity=_track_back_opacity,
+                    rail_fill=_rail_back_color, rail_opacity=_rail_back_opacity
+                )
+
+                self.element_thumb = self.create_thumb(
+                    thumb_left, 0,  # 直接使用计算出的左上角位置
+                    thumb_width - 3.5, thumb_width - 3.5,
+                    _thumb_radius, _thumb_inner_radius,
+                    temppath=self.temppath2, temppath2=self.temppath4, fill=_thumb_back_color,
+                    fill_opacity=_thumb_back_opacity,
+                    outline=_thumb_border_color, outline_opacity=_thumb_border_color_opacity,
+                    outline2=_thumb_border_color2, outline2_opacity=_thumb_border_color2_opacity,
+                    inner_fill=_thumb_inner_back_color, inner_fill_opacity=_thumb_inner_back_opacity,
+                )
 
-            # 创建轨道时，width2 参数应为选中部分的宽度（滑块中心位置）
-            self.element_track = self.create_track(
-                _thumb_width / 4,
-                height / 2 - _track_height,
-                self.winfo_width() - _thumb_width / 2,
-                _track_height,
-                thumb_center - _thumb_width / 4,  # 关键修正：使用滑块中心相对于轨道起点的距离
-                temppath=self.temppath, radius=_radius,
-                track_fill=_track_back_color, track_opacity=_track_back_opacity,
-                rail_fill=_rail_back_color, rail_opacity=_rail_back_opacity
-            )
-
-            self.element_thumb = self.create_thumb(
-                thumb_left, 0,  # 直接使用计算出的左上角位置
-                thumb_width, thumb_width,
-                _thumb_radius, _thumb_inner_radius,
-                temppath=self.temppath2, fill=_thumb_back_color, fill_opacity=_thumb_back_opacity,
-                outline=_thumb_border_color, outline_opacity=_thumb_border_color_opacity,
-                outline2=_thumb_border_color2, outline2_opacity=_thumb_border_color2_opacity,
-                inner_fill=_thumb_inner_back_color, inner_fill_opacity=_thumb_inner_back_opacity,
-            )
 
         self._e1 = self.tag_bind(self.element_thumb, "<Enter>", self._event_enter_thumb, add="+")
         self._e2 = self.tag_bind(self.element_thumb, "<Leave>", self._event_leave_thumb, add="+")

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/text.py

@@ -55,7 +55,7 @@ class FluTextCanvas(DCanvas):
     draw = FluTextDraw
 
     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
@@ -66,7 +66,8 @@ class FluTextCanvas(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
@@ -174,8 +175,14 @@ class FluText(FluTextCanvas, DDrawWidget, FluToolTipBase):
 
         if hasattr(self, "element_border"):
             self.delete(self.element_border)
+
+        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,

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/togglebutton.py

@@ -43,7 +43,7 @@ class FluToggleButtonCanvas(DCanvas):
     draw = FluToggleButtonDraw
 
     def create_round_rectangle_with_text(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,
                                          outline="black", outline2="black", outline_opacity=1, outline2_opacity=1,
                                          width=1,
@@ -54,7 +54,8 @@ class FluToggleButtonCanvas(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_with_text
@@ -174,8 +175,13 @@ class FluToggleButton(FluToggleButtonCanvas, DDrawWidget, FluToolTipBase, FluGra
             _radius = tempcolor.radius
             _text_color = tempcolor.text_color
 
+        from .designs.renderer import get_renderer
+        if get_renderer() == 1:
+            width -= 1
+            height -= 1
+
         self.element_border = self.create_round_rectangle_with_text(
-            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,
             outline=_border_color, outline_opacity=_border_color_opacity, outline2=_border_color2,
             outline2_opacity=_border_color2_opacity,

{tkfluent-0.1.5 → tkfluent-0.1.6}/tkflu/tooltip.py

@@ -5,7 +5,7 @@ import sys
 
 class FluToolTip(FluPopupWindow):
     def __init__(self, widget: Widget, text, mode="light", delay=400, show_time=100.0, *args, **kwargs):
-        super().__init__(*args, transparent_color="#ebebeb", **kwargs)
+        super().__init__(*args, **kwargs)
 
         from .label import FluLabel
         from .frame import FluFrame
@@ -69,7 +69,7 @@ class FluToolTip(FluPopupWindow):
 
 class FluToolTip2(FluPopupWindow):
     def __init__(self, widget, text, mode="light", *args, **kwargs):
-        super().__init__(*args, transparent_color="#ebebeb", **kwargs)
+        super().__init__(*args, **kwargs)
 
         from .label import FluLabel
         from .frame import FluFrame

tkfluent-0.1.5/tkflu/demos/designer.py

@@ -1,33 +0,0 @@
-from tkflu import *
-
-set_animation_steps(10)
-set_animation_step_time(10)
-
-root = FluWindow()
-root.title("tkfluent designer")
-root.geometry("500x300")
-
-theme_manager = FluThemeManager(root)
-
-menubar = FluMenuBar(root)
-
-menu1 = FluMenu()
-menu1.geometry("90x90")
-menu1.add_command(label="Light", command=lambda: theme_manager.mode("light"))
-menu1.add_command(label="Dark", command=lambda: theme_manager.mode("dark"))
-
-def func1():
-    messagebox = FluToplevel()
-    messagebox.geometry("300x200")
-
-    label = FluLabel(messagebox, text="This is a example for tkfluent!", width=160, height=32)
-    label.pack(anchor="center")
-
-menubar.add_command(label="File", style="standard", width=40, command=lambda: print("File -> Clicked"))
-menubar.add_cascade(label="Theme Mode", style="standard", width=85, menu=menu1)
-menubar.add_command(label="About", style="standard", width=45, command=lambda: func1())
-
-menubar.show()
-
-
-root.mainloop()