tkfluent 0.0.5__py3-none-any.whl → 0.0.8__py3-none-any.whl

tkflu/__init__.py

@@ -9,15 +9,18 @@ Fluent设计的tkinter组件库（模板）
 
 from .badge import FluBadge
 from .button import FluButton
+from .bwm import BWm
 from .constants import *
 from .defs import *
 from .entry import FluEntry
 from .frame import FluFrame
+from .icons import *
 from .label import FluLabel
 from .menu import FluMenu
 from .menubar import FluMenuBar
 from .popupmenu import FluPopupMenu, FluPopupMenuWindow
 from .popupwindow import FluPopupWindow
+from .slider import FluSlider
 from .text import FluText
 from .thememanager import FluThemeManager
 from .togglebutton import FluToggleButton

tkflu/__main__.py

@@ -2,11 +2,28 @@ from tkflu import *
 from tkinter import *
 from tkinter.font import *
 
-orange_primary_color()
-
+from tkflu.listbox import FluListBox
+
+blue_primary_color()
+
+def togglestate():
+    if button1.dcget("state") == NORMAL:
+        button1.dconfigure(state=DISABLED)
+        button2.dconfigure(state=DISABLED)
+        entry1.dconfigure(state=DISABLED)
+        button1._draw()
+        button2._draw()
+        entry1._draw()
+    else:
+        button1.dconfigure(state=NORMAL)
+        button2.dconfigure(state=NORMAL)
+        entry1.dconfigure(state=NORMAL)
+        button1._draw()
+        button2._draw()
+        entry1._draw()
 root = FluWindow()
 #root.wincustom(way=0)
-root.wm_geometry("360x500")
+root.geometry("360x600")
 
 popupmenu = FluPopupMenu()
 
@@ -72,6 +89,11 @@ togglebutton2 = FluToggleButton(
 )
 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)
 
@@ -81,6 +103,13 @@ entry2.pack(fill="x", padx=5, pady=5)
 text1 = FluText(frame)
 text1.pack(fill="x", padx=5, pady=5)
 
+slider1 = FluSlider(frame, value=0)
+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=5, pady=5)
 
 root.mainloop()

tkflu/button.py

@@ -61,6 +61,9 @@ class FluButtonCanvas(DCanvas):
     create_roundrect = create_round_rectangle
 
 
+from .constants import MODE, STATE, BUTTONSTYLE
+
+
 class FluButton(FluButtonCanvas, DDrawWidget):
     def __init__(self, *args,
                  text="",
@@ -68,9 +71,9 @@ class FluButton(FluButtonCanvas, DDrawWidget):
                  height=32,
                  command=None,
                  font=None,
-                 mode="light",
-                 style="standard",
-                 state="normal",
+                 mode: MODE = "light",
+                 style: BUTTONSTYLE = "standard",
+                 state: STATE = "normal",
                  **kwargs):
         self._init(mode, style)
 
@@ -95,7 +98,7 @@ class FluButton(FluButtonCanvas, DDrawWidget):
         from .defs import set_default_font
         set_default_font(font, self.attributes)
 
-    def _init(self, mode, style):
+    def _init(self, mode: MODE, style: STATE):
 
         from easydict import EasyDict
 
@@ -161,7 +164,7 @@ class FluButton(FluButtonCanvas, DDrawWidget):
             fill=_text_color, text=self.attributes.text, font=self.attributes.font
         )
 
-    def theme(self, mode=None, style=None):
+    def theme(self, mode: MODE = None, style: BUTTONSTYLE = None):
         if mode:
             self.mode = mode
         if style:

tkflu/constants.py

@@ -1,15 +1,20 @@
+from typing import Literal
+
 NO = FALSE = OFF = 0
 YES = TRUE = ON = 1
 
 # Modes
 LIGHT = 'light'
 DARK = 'dark'
+MODE = Literal["light", "dark"]
 
 # States
 NORMAL = 'normal'
 DISABLED = 'disabled'
+STATE = Literal["normal", "disabled"]
 
 # FluButton Styles
 STANDARD = 'standard'
 ACCENT = 'accent'
 MENU = 'menu'
+BUTTONSTYLE = Literal["standard", "accent", "menu"]

tkflu/defs.py

@@ -11,6 +11,31 @@ def set_default_font(font, attributes):
         attributes.font = SegoeFont()
 
 
+def red_primary_color():
+    from .designs.primary_color import set_primary_color
+    set_primary_color(("#d20e1e", "#f46762"))
+
+
 def orange_primary_color():
     from .designs.primary_color import set_primary_color
     set_primary_color(("#c53201", "#fe7e34"))
+
+
+def yellow_primary_color():
+    from .designs.primary_color import set_primary_color
+    set_primary_color(("#e19d00", "#ffd52a"))
+
+
+def green_primary_color():
+    from .designs.primary_color import set_primary_color
+    set_primary_color(("#0e6d0e", "#45e532"))
+
+
+def blue_primary_color():
+    from .designs.primary_color import set_primary_color
+    set_primary_color(("#005fb8", "#60cdff"))
+
+
+def purple_primary_color():
+    from .designs.primary_color import set_primary_color
+    set_primary_color(("#4f4dce", "#b5adeb"))

tkflu/designs/slider.py

@@ -0,0 +1,253 @@
+from .primary_color import get_primary_color
+
+
+def slider(mode: str, state: str):
+    mode = mode.lower()
+    state = state.lower()
+
+    if mode == "light":
+        if state == "rest":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+                    "inner_radius": 6,
+
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 1,
+
+                    "border_color": "#000000",
+                    "border_color_opacity": 0.058824,
+
+                    "border_color2": "#000000",
+                    "border_color2_opacity": 0.160784,
+
+                    "inner_back_color": get_primary_color()[0],
+                    "inner_back_opacity": 1,
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[0],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#000000",
+                    "back_opacity": 0.445800
+                }
+            }
+        elif state == "hover":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+                    "inner_radius": 8,
+
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 1,
+
+                    "border_color": "#000000",
+                    "border_color_opacity": 0.058824,
+
+                    "border_color2": "#000000",
+                    "border_color2_opacity": 0.160784,
+
+                    "inner_back_color": get_primary_color()[0],
+                    "inner_back_opacity": 1,
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[0],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#000000",
+                    "back_opacity": 0.445800
+                }
+            }
+        elif state == "pressed":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+                    "inner_radius": 5,
+
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 1,
+
+                    "border_color": "#000000",
+                    "border_color_opacity": 0.058824,
+
+                    "border_color2": "#000000",
+                    "border_color2_opacity": 0.160784,
+
+                    "inner_back_color": get_primary_color()[0],
+                    "inner_back_opacity": 0.8,
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[0],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#000000",
+                    "back_opacity": 0.445800
+                }
+            }
+        elif state == "disabled":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+                    "inner_radius": 6,
+
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 1,
+
+                    "border_color": "#000000",
+                    "border_color_opacity": 0.058824,
+
+                    "border_color2": "#000000",
+                    "border_color2_opacity": 0.160784,
+
+                    "inner_back_color": "#000000",
+                    "inner_back_opacity": 0.317300,
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": "#000000",
+                    "back_opacity": 0.216900
+                },
+                "rail": {
+                    "back_color": "#000000",
+                    "back_opacity": 0.317300
+                }
+            }
+    else:
+        if state == "rest":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+
+                    "inner_radius": 6,
+                    "inner_back_color": get_primary_color()[1],
+                    "inner_back_opacity": 1,
+
+                    "back_color": "#454545",
+                    "back_opacity": 1,
+
+                    "border_color": "#FFFFFF",
+                    "border_color_opacity": 0.094118,
+
+                    "border_color2": "#FFFFFF",
+                    "border_color2_opacity": 0.070588,
+
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[1],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 0.544200
+                }
+            }
+        elif state == "hover":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+
+                    "inner_radius": 8,
+                    "inner_back_color": get_primary_color()[1],
+                    "inner_back_opacity": 1,
+
+                    "back_color": "#454545",
+                    "back_opacity": 1,
+
+                    "border_color": "#FFFFFF",
+                    "border_color_opacity": 0.094118,
+
+                    "border_color2": "#FFFFFF",
+                    "border_color2_opacity": 0.070588,
+
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[1],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 0.544200
+                }
+            }
+        elif state == "pressed":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+
+                    "inner_radius": 5,
+                    "inner_back_color": get_primary_color()[1],
+                    "inner_back_opacity": 0.8,
+
+                    "back_color": "#454545",
+                    "back_opacity": 1,
+
+                    "border_color": "#FFFFFF",
+                    "border_color_opacity": 0.094118,
+
+                    "border_color2": "#FFFFFF",
+                    "border_color2_opacity": 0.070588,
+
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": get_primary_color()[1],
+                    "back_opacity": 1
+                },
+                "rail": {
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 0.544200
+                }
+            }
+        elif state == "disabled":
+            return {
+                "radius": 2,
+                "thumb": {
+                    "radius": 12,
+
+                    "inner_radius": 6,
+                    "inner_back_color": "#FFFFFF",
+                    "inner_back_opacity": 0.158100,
+
+                    "back_color": "#454545",
+                    "back_opacity": 1,
+
+                    "border_color": "#FFFFFF",
+                    "border_color_opacity": 0.094118,
+
+                    "border_color2": "#FFFFFF",
+                    "border_color2_opacity": 0.070588,
+
+                },
+                "track": {
+                    "width": 4,
+
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 0.158100
+                },
+                "rail": {
+                    "back_color": "#FFFFFF",
+                    "back_opacity": 0.544200
+                }
+            }

tkflu/designs/window.py

@@ -1,7 +1,7 @@
 def window(mode):
     if mode.lower() == "light":
         return {
-            "back_color": "#ffffff",
+            "back_color": "#f9f9f9",
             "text_color": "#000000",
             "closebutton": {
                 "back_color": "#cf392d",
@@ -11,7 +11,7 @@ def window(mode):
         }
     else:
         return {
-            "back_color": "#202020",
+            "back_color": "#282828",
             "text_color": "#ffffff",
             "closebutton": {
                 "back_color": "#c42b1c",

tkflu/entry.py

@@ -96,7 +96,7 @@ class FluEntry(FluEntryCanvas, DDrawWidget):
 
         super().__init__(*args, width=width, height=height, cursor=cursor, **kwargs)
 
-        self.bind("<FocusIn>", self._event_focus_in, add="+")
+        self.bind("<Button-1>", lambda e: self.entry.focus_set())
 
         self.dconfigure(
             state=state,
@@ -188,6 +188,8 @@ class FluEntry(FluEntryCanvas, DDrawWidget):
             height=self.winfo_height() - _border_width * 2 - _radius
         )
 
+        self.tag_raise(self.element_text)
+
     def _event_focus_in(self, event=None):
         self.isfocus = True
 

tkflu/menu.py

@@ -84,19 +84,19 @@ class FluMenu(FluPopupMenu):
         else:
             id = widget._w
 
-        def command():
+        def command(event=None):
             print(menu._w)
-            menu.focus_set()
 
             menu.popup(widget.winfo_rootx()+widget.winfo_width()+100, widget.winfo_rooty())
             menu.window.deiconify()
             menu.window.attributes("-topmost")
 
         if hasattr(widget, "dconfigure"):
-            widget.dconfigure(text=label, command=command)
+            widget.dconfigure(text=label)
         else:
             if hasattr(widget, "configure"):
-                widget.configure(text=label, command=command)
+                widget.configure(text=label)
+        widget.bind("<Enter>", command, add="+")
         if hasattr(widget, "theme"):
             widget.theme(style=style)
 

tkflu/slider.py

@@ -0,0 +1,404 @@
+from tkdeft.windows.draw import DSvgDraw
+from tkdeft.windows.canvas import DCanvas
+from tkdeft.windows.drawwidget import DDrawWidget
+
+from .designs.slider import slider
+
+
+class FluSliderDraw(DSvgDraw):
+    def create_slider(
+            self,
+            x1, y1, x2, y2,
+            x3,  # 滑块的x坐标
+            r1,  # 滑块外圆半径
+            r2,  # 滑块内圆半径
+            temppath=None,
+            fill="transparent", fill_opacity=1,  # 滑块外圆的背景颜色、透明度
+            radius=3,  # 滑块进度条圆角大小
+            outline="transparent", outline_opacity=1,  # 滑块伪阴影的渐变色中的第一个渐变颜色、透明度
+            outline2="transparent", outline2_opacity=1,  # 滑块伪阴影的渐变色中的第二个渐变颜色、透明度
+            inner_fill="transparent", inner_fill_opacity=1,  # 滑块内圆的背景颜色、透明度
+            track_fill="transparent", track_height=4, track_opacity=1,  # 滑块进度条的选中部分矩形的背景颜色、高度、透明度
+            rail_fill="transparent", rail_opacity=1  #
+    ):
+        drawing = self.create_drawing(x2 - x1, y2 - y1, temppath=temppath, fill_opacity=0)
+
+        border = drawing[1].linearGradient(start=(r1, 1), end=(r1, r1 * 2 - 1), id="DButton.Border",
+                                           gradientUnits="userSpaceOnUse")
+        border.add_stop_color(0.500208, outline, outline_opacity)
+        border.add_stop_color(0.954545, outline2, outline2_opacity)
+        drawing[1].defs.add(border)
+        stroke = f"url(#{border.get_id()})"
+        print("x1:", x1, "\n", "y1:", y1, "\n", "x2:", x2, "\n", "y2:", y2, "\n", "r1:", r1, "\n", sep="")
+
+        x = x1 + r1 - 4
+        xx = x2 - r1 + 4
+
+        print("track_x1:", x, "\n", "track_x2:", xx, sep="")
+
+        print("")
+
+        drawing[1].add(
+            drawing[1].rect(
+                (x, (y2 - y1) / 2 - track_height / 2),
+                # 矩形x位置：画布最左的x坐标 + 滑块外半径 - 滑块内半径
+                # 矩形y位置：画布高度(画布最上的y坐标 - 画布最上的y坐标)一半 - 进度条的高度的一半
+                (xx - x, track_height),
+                # 矩形宽度：画布最右的x坐标 - 滑块外半径 + 滑块内半径 | 矩形高度：进度条的高度
+                rx=radius,
+                fill=rail_fill, fill_opacity=rail_opacity
+            )
+        )  # 滑块进度未选中区域 (占全部)
+
+        drawing[1].add(
+            drawing[1].rect(
+                (x, (y2 - y1) / 2 - track_height / 2),
+                # 矩形x位置：画布最左的x坐标 + 滑块外半径 - 滑块内半径
+                # 矩形y位置：画布高度(画布最上的y坐标 - 画布最上的y坐标)一半 - 进度条的高度的一半
+                (x3 - x, track_height),
+                # 矩形宽度：(滑块的x坐标 - 矩形x位置) | 矩形高度：进度条的高度
+                rx=radius,
+                fill=track_fill, fill_opacity=track_opacity, fill_rule="evenodd"
+            )
+        )  # 滑块进度左边的选中区域 (只左部分)
+
+        x = x3
+        y = (y2 - y1) / 2
+
+        drawing[1].add(
+            drawing[1].circle(
+                (x, y), r1,
+                fill=stroke, fill_opacity=1, fill_rule="evenodd"
+            )
+        )  # 圆形滑块的伪阴影边框
+        drawing[1].add(
+            drawing[1].circle(
+                (x, y), r1 - 1,
+                fill=fill, fill_opacity=fill_opacity, fill_rule="nonzero"
+            )
+        )  # 圆形滑块的外填充
+        drawing[1].add(
+            drawing[1].circle(
+                (x, y), r2,
+                fill=inner_fill, fill_opacity=inner_fill_opacity, fill_rule="nonzero"
+            )
+        )  # 圆形滑块的内填充
+        drawing[1].save()
+        return drawing[0]
+
+
+class FluSliderCanvas(DCanvas):
+    draw = FluSliderDraw
+
+    def create_slider(self,
+                      x1, y1, x2, y2, x3, r1, r2, temppath=None,
+                      fill="transparent", fill_opacity=1, radius=3,
+                      outline="transparent", outline_opacity=1,
+                      outline2="transparent", outline2_opacity=1,
+                      inner_fill="transparent", inner_fill_opacity=1,
+                      track_fill="transparent", track_height=4, track_opacity=1,
+                      rail_fill="transparent", rail_opacity=1
+                      ):
+        self._img = self.svgdraw.create_slider(
+            x1, y1, x2, y2, x3, r1, r2, temppath=temppath,
+            fill=fill, fill_opacity=fill_opacity, radius=radius,
+            outline=outline, outline_opacity=outline_opacity,
+            outline2=outline2, outline2_opacity=outline2_opacity,
+            inner_fill=inner_fill, inner_fill_opacity=inner_fill_opacity,
+            track_fill=track_fill, track_height=track_height, track_opacity=track_opacity,
+            rail_fill=rail_fill, rail_opacity=rail_opacity
+        )
+        self._tkimg = self.svgdraw.create_tksvg_image(self._img)
+        return self.create_image(x1, y1, anchor="nw", image=self._tkimg)
+
+
+class FluSlider(FluSliderCanvas, DDrawWidget):
+    def __init__(self, *args,
+                 text="",
+                 width=70,
+                 height=28,
+                 font=None,
+                 mode="light",
+                 state="normal",
+                 value=20,
+                 max=100,
+                 min=0,
+                 **kwargs
+                 ):
+
+        """
+
+        初始化类
+
+        :param args: 参照tkinter.Canvas.__init__
+        :param text:
+        :param width:
+        :param height:
+        :param font:
+        :param mode: Fluent主题模式 分为 “light” “dark”
+        :param style:
+        :param kwargs: 参照tkinter.Canvas.__init__
+        """
+
+        self._init(mode)
+
+        self.dconfigure(
+            state=state,
+            value=value,
+            max=max, min=min,
+        )
+
+        super().__init__(*args, width=width, height=height, **kwargs)
+
+        self.bind("<<Clicked>>", lambda event=None: self.focus_set(), add="+")
+
+        self.bind("<Motion>", self._event_button1_motion)
+
+        from .defs import set_default_font
+        set_default_font(font, self.attributes)
+
+    def _init(self, mode):
+        from easydict import EasyDict
+
+        self.attributes = EasyDict(
+            {
+                "command": None,
+                "state": None,
+
+                "value": 20,
+                "max": 100,
+                "min": 0,
+
+                "rest": {},
+                "hover": {},
+                "pressed": {},
+                "disabled": {},
+            }
+        )
+
+        self.theme(mode)
+
+    def _draw(self, event=None):
+
+        """
+        重新绘制组件
+
+        :param event:
+        """
+
+        super()._draw(event)
+
+        print("width:", self.winfo_width(), "\n", "height:", self.winfo_height(), sep="")
+
+        print("")
+
+        self.delete("all")
+
+        state = self.dcget("state")
+
+        _dict = None
+
+        if state == "normal":
+            if event:
+                if self.enter:
+                    if self.button1:
+                        _dict = self.attributes.pressed
+                    else:
+                        _dict = self.attributes.hover
+                else:
+                    _dict = self.attributes.rest
+            else:
+                _dict = self.attributes.rest
+        else:
+            _dict = self.attributes.disabled
+
+        _radius = _dict.radius
+
+        _track_height = _dict.track.width
+        _track_back_color = _dict.track.back_color
+        _track_back_opacity = _dict.track.back_opacity
+
+        _rail_back_color = _dict.rail.back_color
+        _rail_back_opacity = _dict.rail.back_opacity
+
+        _thumb_radius = _dict.thumb.radius
+        _thumb_inner_radius = _dict.thumb.inner_radius
+
+        _thumb_back_color = _dict.thumb.back_color
+        _thumb_back_opacity = _dict.thumb.back_opacity
+
+        _thumb_border_color = _dict.thumb.border_color
+        _thumb_border_color_opacity = _dict.thumb.border_color_opacity
+
+        _thumb_border_color2 = _dict.thumb.border_color2
+        _thumb_border_color2_opacity = _dict.thumb.border_color2_opacity
+
+        _thumb_inner_back_color = _dict.thumb.inner_back_color
+        _thumb_inner_back_opacity = _dict.thumb.inner_back_opacity
+
+        thumb_xp = self.attributes.value / (self.attributes.max - self.attributes.min)  # 滑块对应数值的比例
+        thumb_x = (self.winfo_width() - (_thumb_radius + 4) * 2) * thumb_xp  # 滑块对应数值的x左边
+
+        self.attributes["^r"] = _thumb_radius  # 滑块进度条x坐标
+        self.attributes["^x"] = _thumb_radius - 4  # 滑块进度条
+        self.attributes["^xx"] = self.winfo_width() - _thumb_radius + 4
+
+        self.element_thumb = self.create_slider(
+            0, 0, self.winfo_width(), self.winfo_height(), thumb_x, _thumb_radius, _thumb_inner_radius,
+            temppath=self.temppath,
+            fill=_thumb_back_color, fill_opacity=_thumb_back_opacity, radius=_radius,
+            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,
+            track_height=_track_height, track_fill=_track_back_color, track_opacity=_track_back_opacity,
+            rail_fill=_rail_back_color, rail_opacity=_rail_back_opacity
+        )
+
+    def pos(self, event):
+        if self.enter:
+            if self.button1:
+                valuep = (event.x - self.attributes["^x"]) / (self.attributes["^xx"] - self.attributes["^x"]) # 数值的比例：(鼠标点击的x坐标 - 滑块进度条的x坐标) ÷ 滑块进度条的宽度
+                value = (event.x - self.attributes["max"] - self.attributes["min"])  # 数值的比例 × 数值范围(最大数值 - 最小数值)
+                value = ((event.x + self.attributes["^r"]) / (self.winfo_width())) * self.attributes.max
+                self.dconfigure(
+                    value=value
+                )
+                print("value:", value, sep="")
+                print("")
+
+    def _event_button1_motion(self, event):
+        self.pos(event)
+
+    def _event_on_button1(self, event=None):
+        super()._event_on_button1(event=event)
+        self.pos(event)
+
+    def theme(self, mode=None):
+        if mode:
+            self.mode = mode
+        if self.mode.lower() == "dark":
+            self._dark()
+        else:
+            self._light()
+
+    def _theme(self, mode):
+        r = slider(mode, "rest")
+        h = slider(mode, "hover")
+        p = slider(mode, "pressed")
+        d = slider(mode, "disabled")
+        self.dconfigure(
+            rest={
+                "radius": r["radius"],
+                "thumb": {
+                    "radius": r["thumb"]["radius"],
+                    "inner_radius": r["thumb"]["inner_radius"],
+
+                    "back_color": r["thumb"]["back_color"],
+                    "back_opacity": r["thumb"]["back_opacity"],
+
+                    "border_color": r["thumb"]["border_color"],
+                    "border_color_opacity": r["thumb"]["border_color_opacity"],
+                    "border_color2": r["thumb"]["border_color2"],
+                    "border_color2_opacity": r["thumb"]["border_color2_opacity"],
+
+                    "inner_back_color": r["thumb"]["inner_back_color"],
+                    "inner_back_opacity": r["thumb"]["inner_back_opacity"],
+                },
+                "track": {
+                    "back_color": r["track"]["back_color"],
+                    "back_opacity": r["track"]["back_opacity"],
+                    "width": r["track"]["width"]
+                },
+                "rail": {
+                    "back_color": r["rail"]["back_color"],
+                    "back_opacity": r["rail"]["back_opacity"],
+                }
+            },
+            hover={
+                "radius": h["radius"],
+                "thumb": {
+                    "radius": h["thumb"]["radius"],
+                    "inner_radius": h["thumb"]["inner_radius"],
+
+                    "back_color": h["thumb"]["back_color"],
+                    "back_opacity": h["thumb"]["back_opacity"],
+
+                    "border_color": h["thumb"]["border_color"],
+                    "border_color_opacity": h["thumb"]["border_color_opacity"],
+                    "border_color2": h["thumb"]["border_color2"],
+                    "border_color2_opacity": h["thumb"]["border_color2_opacity"],
+
+                    "inner_back_color": h["thumb"]["inner_back_color"],
+                    "inner_back_opacity": h["thumb"]["inner_back_opacity"],
+                },
+                "track": {
+                    "back_color": h["track"]["back_color"],
+                    "back_opacity": h["track"]["back_opacity"],
+                    "width": h["track"]["width"]
+                },
+                "rail": {
+                    "back_color": h["rail"]["back_color"],
+                    "back_opacity": h["rail"]["back_opacity"],
+                }
+            },
+            pressed={
+                "radius": p["radius"],
+                "thumb": {
+                    "radius": p["thumb"]["radius"],
+                    "inner_radius": p["thumb"]["inner_radius"],
+
+                    "back_color": p["thumb"]["back_color"],
+                    "back_opacity": p["thumb"]["back_opacity"],
+
+                    "border_color": p["thumb"]["border_color"],
+                    "border_color_opacity": p["thumb"]["border_color_opacity"],
+                    "border_color2": p["thumb"]["border_color2"],
+                    "border_color2_opacity": p["thumb"]["border_color2_opacity"],
+
+                    "inner_back_color": p["thumb"]["inner_back_color"],
+                    "inner_back_opacity": p["thumb"]["inner_back_opacity"],
+                },
+                "track": {
+                    "back_color": p["track"]["back_color"],
+                    "back_opacity": p["track"]["back_opacity"],
+                    "width": p["track"]["width"]
+                },
+                "rail": {
+                    "back_color": p["rail"]["back_color"],
+                    "back_opacity": p["rail"]["back_opacity"],
+                }
+            },
+            disabled={
+                "radius": d["radius"],
+                "thumb": {
+                    "radius": d["thumb"]["radius"],
+                    "inner_radius": d["thumb"]["inner_radius"],
+
+                    "back_color": d["thumb"]["back_color"],
+                    "back_opacity": d["thumb"]["back_opacity"],
+
+                    "border_color": d["thumb"]["border_color"],
+                    "border_color_opacity": d["thumb"]["border_color_opacity"],
+                    "border_color2": d["thumb"]["border_color2"],
+                    "border_color2_opacity": d["thumb"]["border_color2_opacity"],
+
+                    "inner_back_color": d["thumb"]["inner_back_color"],
+                    "inner_back_opacity": d["thumb"]["inner_back_opacity"],
+                },
+                "track": {
+                    "back_color": d["track"]["back_color"],
+                    "back_opacity": d["track"]["back_opacity"],
+                    "width": d["track"]["width"]
+                },
+                "rail": {
+                    "back_color": d["rail"]["back_color"],
+                    "back_opacity": d["rail"]["back_opacity"],
+                }
+            }
+        )
+
+    def _light(self):
+        self._theme("light")
+
+    def _dark(self):
+        self._theme("dark")

tkflu/text.py

@@ -96,7 +96,7 @@ class FluText(FluTextCanvas, DDrawWidget):
 
         super().__init__(*args, width=width, height=height, cursor=cursor, **kwargs)
 
-        self.bind("<FocusIn>", self._event_focus_in, add="+")
+        self.bind("<Button-1>", lambda e: self.text.focus_set(), add="+")
 
         self.dconfigure(
             state=state,
@@ -191,9 +191,13 @@ class FluText(FluTextCanvas, DDrawWidget):
             height=self.winfo_height() - _border_width * 2 - _radius
         )
 
+        #self.tag_raise(self.element_text)
+
     def _event_focus_in(self, event=None):
         self.isfocus = True
 
+        self.text.focus_set()
+
         self._draw(event)
 
     def _event_focus_out(self, event=None):

{tkfluent-0.0.5.dist-info → tkfluent-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: tkfluent
-Version: 0.0.5
+Version: 0.0.8
 Summary: Fluent Design for Tkinter
 Author: XiangQinxi
 Author-email: xiangqinxi@outlook.com
@@ -12,10 +12,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: easydict (>=1.13,<2.0)
 Requires-Dist: pillow (>=10.2.0,<11.0.0)
 Requires-Dist: svgwrite (>=1.4.3,<2.0.0)
-Requires-Dist: tkdeft (>=0.0.7,<0.0.8)
+Requires-Dist: tkdeft (>=0.0.9,<0.0.10)
 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
@@ -24,3 +25,5 @@ Description-Content-Type: text/markdown
 # tkfluent
 
 `tkinter`现代化组件库。设计来于`Fluent` `WinUI3` 设计
+
+![](https://learn.microsoft.com/zh-cn/windows/apps/images/logo-winui.png)

{tkfluent-0.0.5.dist-info → tkfluent-0.0.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
-tkflu/__init__.py,sha256=slDm1_ErwpLqaGkfXdNe7Q7pqE-W42HTedfHnKC4Ppo,884
-tkflu/__main__.py,sha256=HJhwQ47_YCin51sJ-ffh8PUFPTE9uZPpbqSNkoypJec,2251
+tkflu/__init__.py,sha256=bzZaBMwXxh13kEeiVdPt1Nt0qKktodJeqWZDopssaDg,959
+tkflu/__main__.py,sha256=Ur8ZHY8fkaqavrzKrMlQdywmjm2My7WdYyB9gemY6II,3092
 tkflu/badge.py,sha256=8gnHM5cYRqkZWg_Mq3rMfFcUgtnW6hcAH47DQdj9hNI,5730
-tkflu/button.py,sha256=SW86Fs0DCCQQRHekzXaAEy9ypeKZBJZgUkHz5pcIQPY,9434
+tkflu/button.py,sha256=PupPJklNYOHig_Qq8il0ervjFe7jKxquktI3bHaD8_E,9555
 tkflu/bwm.py,sha256=TN0PO7McBxiRC7gcwsMFFTgHt5TFi-t3Kixrvo-p5_4,6976
 tkflu/checkbox.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/constants.py,sha256=UuVMgqBKn_nzoe9JsJKfXRZmSUafDdld2xYIHuLn-D0,219
+tkflu/constants.py,sha256=jUSmhlY9-02uqSHeO55MimWpGCXCwfNuPfRPSvNaTGU,374
 tkflu/customwindow.py,sha256=Fr4CF0vKwj36tYzgX9_5F7OwcD59z9LfOW20Ugm2Hxc,3761
 tkflu/customwindow2.py,sha256=nyNEMoGVnOYXCPbdvxZFUH-VlpAtjjEGI8Ul9VDvgAs,2109
-tkflu/defs.py,sha256=7PCC5htc0qXG5Y6o1sT3peY635JLdsYL4ZQPucUSWgg,460
+tkflu/defs.py,sha256=pKVQUm-dK12QiU2MMFD7sxoiXfhEsezN_uAV6eE5Cbk,1144
 tkflu/designs/__init__.py,sha256=2Z4lCHHwMtXinGQgowsQeLkGBl20c5iMOR6GjvE4my4,113
 tkflu/designs/badge.py,sha256=SVwDrQPltscB7YDvw5qhPdepKy1S-pcdD6OyYfonwzQ,1463
 tkflu/designs/button.py,sha256=yEKRrH5dcDQCaGGqsYRnKgaCPSSd8cU__31LOQf2JX0,12274
@@ -17,26 +17,28 @@ tkflu/designs/fonts/__init__.py,sha256=lKvu4DKjRaWNczHas_YJZNx_LVr9tt3W_kFkJJRju
 tkflu/designs/fonts/segoeui.ttf,sha256=dPKz0MIM9zgOsSGgn9fN_cHM3RKgDbg8rsD-tItNufc,975088
 tkflu/designs/frame.py,sha256=ypv5DilK1ZAsbGIzPIBPQFRrnfC7XtFYpvUFmUd6hdg,1167
 tkflu/designs/primary_color.py,sha256=1gEM9qvHNNA09k4QOEFG0DUMhCqSK5C47YW-Nk6k4vY,729
+tkflu/designs/slider.py,sha256=1JsWvE8tQ6oI3vfS7iDMlES17n6ri8q9D2ym456i5CY,7800
 tkflu/designs/text.py,sha256=YMJR2eGE7lFIZPYrT7p8QBD3zRH4NaVWhrL1dOb6vJ4,5059
-tkflu/designs/window.py,sha256=pYovade_k_sHLtop9w9wVL1Gpxl9wxGncTiv7_Fnqqg,625
-tkflu/entry.py,sha256=qsJTA9xLs27Ez5pUzahgBO-RYxS-xN9qnuM17HaurgM,10746
+tkflu/designs/window.py,sha256=XHMvT0lVsJSeUApMf_bf9ipLSWT-BirkOiiUnVx-N48,625
+tkflu/entry.py,sha256=XvjMgAYU_SukqSXkWS1RCYBRnq1VdgkOZX-fDVQY6O0,10795
 tkflu/frame.py,sha256=KgmKEKXNZJgCi1_j4ChsnvDHmYL0OqksLuBhbXA0YRM,10107
 tkflu/icons.py,sha256=Xzrc9WzexncYEPXqnVg3ywWv_7kLZLyYC5WtaRv30PQ,7129
 tkflu/image.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tkflu/label.py,sha256=N4EfohaDbHiCYOmoRBz-TDNc-2kcvoDDazekRZIABXg,1561
 tkflu/listbox.py,sha256=gD_oNNWVZtm5qXQ8bVBNRqJL6CGiIYtvhxztM9huzew,9991
 tkflu/litenav.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tkflu/menu.py,sha256=0Kjph9Zt8w1H_EUGPJa2qIr-39T1AodAvv9B7JE-IRw,3198
+tkflu/menu.py,sha256=cFx4T3bmrdMS9hXw-WQFtWCzysQ7UnldtFVhgHM7KXU,3194
 tkflu/menubar.py,sha256=2XdMfWy6djGU3RL1ykbaUR6bj0rwaqdUJmufOzsdOPE,4027
 tkflu/popupmenu.py,sha256=dRwuFK7PKSYXiLhzrrzjKXTjtLfr7vh0KDvJIUjDetg,1592
 tkflu/popupwindow.py,sha256=r3nfZI4QWWhrde_AX2vN33l9XuQ_wbCNzs3eakUPFqo,935
 tkflu/scrollbar.py,sha256=1hbu5n1mx4KyiF_M3sohpJJPux1zu5Jlw9V6LfQQs1Y,7293
-tkflu/text.py,sha256=PtGQBhA31pHALqfn1zlFTo64l0BFcKmgjspjTueg_9g,10743
+tkflu/slider.py,sha256=m-tL9lnC_5YYrQxgI_L3Ljo2QLELINpPja4GML9qZgo,16107
+tkflu/text.py,sha256=NHu-jiGBlf4tH3Ar0LjnlV3v93GifImJ19O65yg4XTY,10834
 tkflu/thememanager.py,sha256=oG-VWkFogVJJOmsz67hyVfvNdkWMUeP252Qcez8FQmk,963
 tkflu/togglebutton.py,sha256=WtSzLHP4Al00po5DEaa_hzGqsXTB6mVH4n8kPJXbnOc,14773
 tkflu/tooltip.py,sha256=MlaV1GrkWsllkRlKswytQtU6Fwc332YSSo0IY9yj-n0,205
 tkflu/toplevel.py,sha256=gcLz93Q9OgWc9dV4d-TK6gXk5eIetFuU5CbO8ybAvsI,815
 tkflu/window.py,sha256=cp1nm5Eh2PYO1XzTKVX2ic7f4Xx1JREWlBRuO02MK64,980
-tkfluent-0.0.5.dist-info/METADATA,sha256=nIfnjwvxIGz3JvAEbl5Mo1wtH3ngpP8ZvcEHnWdxq5w,940
-tkfluent-0.0.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-tkfluent-0.0.5.dist-info/RECORD,,
+tkfluent-0.0.8.dist-info/METADATA,sha256=bY8FCVge5rdIVycKXa-iTc4boYhvK2SOd-pKn4vihDk,1067
+tkfluent-0.0.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+tkfluent-0.0.8.dist-info/RECORD,,

{tkfluent-0.0.5.dist-info → tkfluent-0.0.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any