feat(theme): 更新主题应用逻辑

- 新增 EnhancedTheme 接口，扩展了原 Theme 接口的功能
- 重构 BaseTheme、ClamTheme、WindowsTheme 类以实现新接口
- 更新 ExtendedTk 和 ExtendedDialog 类以支持新主题
- 新增 EVENT_ENHANCED_THEME_CHANGED 事件用于主题变更通知

Author: Jesse205

docs/profile.md

@@ -51,7 +51,7 @@
 1. 打开配置文件：`~/.vcf_generator_lite.py`
 2. 添加配置代码：
     ````python
-    from tkinter import Misc, Tk
+    from tkinter import Tk
     from tkinter.ttk import Style
     from typing import override
 
@@ -60,17 +60,16 @@
 
     class ClassicTheme(BaseTheme):
         @override
-        def apply_theme(self, master: Misc, style: Style):
-            super().apply_theme(master, style)
+        def apply_tk(self, master: Tk, style: Style):
+            super().apply_tk(master, style)
             style.theme_use("classic")
             style.configure("TButton", padding="1p", width=11)
             style.configure("Vertical.TScrollbar", arrowsize="9p")
             style.configure("DialogHeader.TFrame", relief="raised")
             style.configure("TextFrame.TEntry", padding=0, borderwidth="2p")
 
             window_background = style.lookup("TFrame", "background")
-            if isinstance(master, Tk):
-                master.configure(background=window_background)
+            master.configure(background=window_background)
             master.option_add("*Toplevel.background", window_background)
 
 

src/vcf_generator_lite/theme/__init__.py

@@ -1,10 +1,10 @@
 from vcf_generator_lite.util.environment import is_windows
-from vcf_generator_lite.util.tkinter.theme import Theme
+from vcf_generator_lite.util.tkinter.theme import EnhancedTheme
 
 __all__ = ["create_platform_theme"]
 
 
-def create_platform_theme() -> Theme:
+def create_platform_theme() -> EnhancedTheme:
     if is_windows:
         from vcf_generator_lite.theme.widows_theme import WindowsTheme
         return WindowsTheme()

src/vcf_generator_lite/theme/base.py

@@ -1,14 +1,18 @@
 from abc import ABC
-from tkinter import Misc
+from tkinter import Tk, Toplevel
 from tkinter.ttk import Style
 from typing import override
 
-from vcf_generator_lite.util.tkinter.theme import Theme
+from vcf_generator_lite.util.tkinter.theme import EnhancedTheme
 
 
-class BaseTheme(Theme, ABC):
+class BaseTheme(EnhancedTheme, ABC):
 
     @override
-    def apply_theme(self, master: Misc, style: Style):
+    def apply_tk(self, master: Tk, style: Style):
+        # 防止编辑框将其他组件挤出窗口
         master.option_add("*TextFrame.Text.width", 0, "widgetDefault")
         master.option_add("*TextFrame.Text.height", 0, "widgetDefault")
+
+    @override
+    def apply_window(self, master: Tk | Toplevel, style: Style): pass

src/vcf_generator_lite/theme/clam_theme.py

@@ -1,4 +1,4 @@
-from tkinter import Misc, Tk
+from tkinter import Tk, Toplevel
 from tkinter.font import nametofont
 from tkinter.ttk import Style
 from typing import override
@@ -8,10 +8,10 @@
 
 class ClamTheme(BaseTheme):
     @override
-    def apply_theme(self, master: Misc, style: Style):
-        super().apply_theme(master, style)
+    def apply_tk(self, master: Tk, style: Style):
+        super().apply_tk(master, style)
         style.theme_use("clam")
-        default_font = nametofont("TkMenuFont")
+        default_font = nametofont("TkDefaultFont")
         default_font_size = int(default_font.actual("size"))
 
         # 重写部分配置以适配高分屏
@@ -24,8 +24,9 @@ def apply_theme(self, master: Misc, style: Style):
         style.configure("DialogHeader.TFrame", relief="raised")
         style.configure("TextFrame.TEntry", padding=0, borderwidth="1.5p")
 
+    @override
+    def apply_window(self, master: Tk | Toplevel, style: Style):
+        super().apply_window(master, style)
         # 窗口背景色不会跟随主题变化，需要手动设置
         window_background = style.lookup("TFrame", "background")
-        if isinstance(master, Tk):
-            master.configure(background=window_background)
-        master.option_add("*Toplevel.background", window_background)
+        master.configure(background=window_background)

src/vcf_generator_lite/theme/widows_theme.py

@@ -1,4 +1,4 @@
-from tkinter import Misc
+from tkinter import Tk
 from tkinter.font import nametofont
 from tkinter.ttk import Style
 from typing import override
@@ -8,11 +8,12 @@
 
 class WindowsTheme(BaseTheme):
     @override
-    def apply_theme(self, master: Misc, style: Style):
-        super().apply_theme(master, style)
+    def apply_tk(self, master: Tk, style: Style):
+        super().apply_tk(master, style)
         style.theme_use("vista")
-        default_font = nametofont("TkMenuFont")
+        default_font = nametofont("TkDefaultFont")
         default_font_size = int(default_font.actual("size"))
+
         # 重写部分配置以适配高分屏
         style.configure("TButton", padding="2.5p")
         style.configure("Treeview", rowheight=f"{default_font_size + 6}p")
@@ -26,4 +27,4 @@ def apply_theme(self, master: Misc, style: Style):
 
         # Windows 7 中菜单默认不使用TkMenuFont，因此需要手动设置字体。
         menu_font = nametofont("TkMenuFont")
-        master.option_add("*Menu.font", menu_font)
+        master.option_add("*Menu.font", menu_font, "widgetDefault")

src/vcf_generator_lite/util/tkinter/theme.py

@@ -1,8 +1,11 @@
 from abc import ABC, abstractmethod
-from tkinter import Misc
+from tkinter import Tk, Toplevel
 from tkinter.ttk import Style
 
 
-class Theme(ABC):
+class EnhancedTheme(ABC):
     @abstractmethod
-    def apply_theme(self, master: Misc, style: Style): pass
+    def apply_tk(self, master: Tk, style: Style): pass
+
+    @abstractmethod
+    def apply_window(self, master: Tk | Toplevel, style: Style): pass

src/vcf_generator_lite/window/base/__init__.py

@@ -7,10 +7,10 @@
 from vcf_generator_lite import resources
 from vcf_generator_lite.theme import create_platform_theme
 from vcf_generator_lite.util.tkinter.misc import ScalingMiscExtension
-from vcf_generator_lite.util.tkinter.theme import Theme
+from vcf_generator_lite.util.tkinter.theme import EnhancedTheme
 from vcf_generator_lite.util.tkinter.window import CenterWindowExtension, GcWindowExtension, GeometryWindowExtension, \
     WindowExtension, WindowingSystemWindowExtension, withdraw_cm
-from vcf_generator_lite.window.base.constants import EVENT_EXIT
+from vcf_generator_lite.window.base.constants import EVENT_ENHANCED_THEME_CHANGED, EVENT_EXIT
 
 __all__ = ["ExtendedTk", "ExtendedToplevel", "ExtendedDialog"]
 _logger = logging.getLogger(__name__)
@@ -49,6 +49,7 @@ def __apply_default_events(self):
 
 
 class ExtendedTk(Tk, AppWindowExtension, ABC):
+    theme: EnhancedTheme
 
     def __init__(self, **kw):
         # __init__中加载的配置文件中可能需要设置主题，因此必须先设置标志
@@ -66,8 +67,11 @@ def _configure_ui_withdraw(self):
     def __apply_default_icon(self):
         self.iconphoto(True, PhotoImage(master=self, data=resources.read_binary("images/icon-48.png")))
 
-    def set_theme(self, theme: Theme):
-        theme.apply_theme(self, Style(self))
+    def set_theme(self, theme: EnhancedTheme):
+        self.theme = theme
+        theme.apply_tk(self, Style(self))
+        theme.apply_window(self, Style(self))
+        self.event_generate(EVENT_ENHANCED_THEME_CHANGED, )
         self._theme_applied = True
 
 
@@ -76,11 +80,18 @@ def __init__(self, master: Tk | Toplevel, **kw):
         super().__init__(master, **kw)
         AppWindowExtension.__init__(self)
 
+    @override
+    def _configure_ui_withdraw(self):
+        super()._configure_ui_withdraw()
+        self.__apply_theme()
 
-class ExtendedDialog(Toplevel, AppWindowExtension, ABC):
-    def __init__(self, master: Tk | Toplevel, **kw):
-        super().__init__(master, **kw)
-        AppWindowExtension.__init__(self)
+    def __apply_theme(self):
+        root: ExtendedTk = self.nametowidget(".")
+        root.theme.apply_window(self, Style(self))
+        root.bind(EVENT_ENHANCED_THEME_CHANGED, lambda _: root.theme.apply_window(self, Style(self)))
+
+
+class ExtendedDialog(ExtendedToplevel, ABC):
 
     @override
     def _configure_ui_withdraw(self):

src/vcf_generator_lite/window/base/constants.py

@@ -1 +1,2 @@
-EVENT_EXIT = "<<Exit>>"
+EVENT_EXIT = "<<Exit>>"
+EVENT_ENHANCED_THEME_CHANGED = "<<EnhancedThemeChanged>>"