fix(gui): 修复字体缩放

Closes #IASPCW

- 在 clam_theme 和 windows_theme 中使用默认字体大小来计算 Treeview 行高
- 修改 extend_font 函数为 extend_font_scale，以适应不同 DPI
- 更新 About 和 Invalid Lines 窗口中的字体使用新的缩放方法
- 优化 HTML 解析器中的标签字体大小设置

Author: Jesse205

src/vcf_generator_lite/theme/clam_theme.py

@@ -1,4 +1,5 @@
-from tkinter import Tk, Misc
+from tkinter import Misc, Tk
+from tkinter.font import nametofont
 from tkinter.ttk import Style
 from typing import override
 
@@ -10,10 +11,12 @@ class ClamTheme(BaseTheme):
     def apply_theme(self, master: Misc, style: Style):
         super().apply_theme(master, style)
         style.theme_use("clam")
+        default_font = nametofont("TkMenuFont")
+        default_font_size = int(default_font.actual("size"))
 
         # 重写部分配置以适配高分屏
         style.configure("TButton", padding="2.5p")
-        style.configure("Treeview", rowheight="15p")
+        style.configure("Treeview", rowheight=f"{default_font_size + 6}p")
         style.configure("Heading", padding="2.25p")
         style.configure("Vertical.TScrollbar", arrowsize="9p")
 

src/vcf_generator_lite/theme/widows_theme.py

@@ -11,10 +11,11 @@ class WindowsTheme(BaseTheme):
     def apply_theme(self, master: Misc, style: Style):
         super().apply_theme(master, style)
         style.theme_use("vista")
-
+        default_font = nametofont("TkMenuFont")
+        default_font_size = int(default_font.actual("size"))
         # 重写部分配置以适配高分屏
         style.configure("TButton", padding="2.5p")
-        style.configure("Treeview", rowheight="15p")
+        style.configure("Treeview", rowheight=f"{default_font_size + 6}p")
         style.configure("Heading", padding="1.5p")
 
         # 自定义组件

src/vcf_generator_lite/util/tkinter/font.py

@@ -1,6 +1,5 @@
 from tkinter.font import nametofont
-from typing import TypedDict, Literal
-from typing import Unpack
+from typing import Literal, TypedDict
 
 
 class FontConfig(TypedDict, total=False):
@@ -12,7 +11,7 @@ class FontConfig(TypedDict, total=False):
     overstrike: bool
 
 
-def extend_font(origin_name: str, **options: Unpack[FontConfig]):
+def extend_font_scale(origin_name: str, scale: float):
     font = nametofont(origin_name).copy()
-    font.config(**options)
+    font.configure(size=round(int(font.actual("size")) * scale))
     return font

src/vcf_generator_lite/widget/tkhtmlview/html_parser.py

@@ -288,11 +288,11 @@ def _parse_attrs(self, attrs):
                     except:
                         pass
             elif k in (
-                HTML.Attrs.HREF,
-                HTML.Attrs.SRC,
-                HTML.Attrs.WIDTH,
-                HTML.Attrs.HEIGHT,
-                HTML.Attrs.TYPE,
+                    HTML.Attrs.HREF,
+                    HTML.Attrs.SRC,
+                    HTML.Attrs.WIDTH,
+                    HTML.Attrs.HEIGHT,
+                    HTML.Attrs.TYPE,
             ):
                 attrs_dict[k] = v
         return attrs_dict
@@ -646,8 +646,8 @@ def handle_data(self, data):
             data = f"{data} "  # FIXME: attaching a space in blind is wrong
             data = self._remove_multi_spaces(data)
             if len(self.html_tags) and self.html_tags[-1] in (
-                HTML.Tag.UL,
-                HTML.Tag.OL,
+                    HTML.Tag.UL,
+                    HTML.Tag.OL,
             ):
                 self._w.insert(tk.INSERT, "\t" * 2 * len(self.list_tags))
 
@@ -712,12 +712,15 @@ def _w_tags_apply_all(self):
 
         # add tags
         self.hlink_slots = []
+        default_font_scaling = int(self.default_font.actual("size")) / 9
         for key, tag in self._w_tags.items():
             if "config" in tag:  # HF change justify to left for tkinter (only supports left, right, center)
                 if tag["config"].get("justify") == "justify":
                     tag["config"]["justify"] = "left"
             self._w.tag_add(key, tag[WTag.START_INDEX], tag[WTag.END_INDEX])
             tag_font = self.default_font.copy() if self.default_font is not None else font.Font()
+            if "size" in tag[Fnt.KEY]:
+                tag[Fnt.KEY]["size"] = int(default_font_scaling * tag[Fnt.KEY]["size"])
             tag_font.config(**tag[Fnt.KEY])
             self._w.tag_config(key, font=tag_font, selectforeground=self.default_selectforeground,
                                selectbackground=self.default_selectbackground, **tag[WCfg.KEY])

src/vcf_generator_lite/window/about/window.py

@@ -7,7 +7,7 @@
 from vcf_generator_lite.__version__ import __version__
 from vcf_generator_lite.constants import APP_COPYRIGHT, APP_NAME
 from vcf_generator_lite.layout.vertical_dialog_layout import VerticalDialogLayout
-from vcf_generator_lite.util.tkinter.font import extend_font
+from vcf_generator_lite.util.tkinter.font import extend_font_scale
 from vcf_generator_lite.widget.menu import TextContextMenu
 from vcf_generator_lite.widget.tkhtmlview import HTMLScrolledText
 from vcf_generator_lite.window.base import ExtendedDialog
@@ -58,7 +58,7 @@ def _create_header(self, parent: Misc):
             app_info_frame,
             text=f"{APP_NAME} v{__version__}",
             style="DialogHeaderContent.TLabel",
-            font=extend_font("TkDefaultFont", size=12),
+            font=extend_font_scale("TkDefaultFont", 12 / 9),
         )
         app_name_label.pack(anchor=W)
         app_copyright_label = Label(app_info_frame, text=APP_COPYRIGHT, style="DialogHeaderContent.TLabel")

src/vcf_generator_lite/window/invalid_lines/window.py

@@ -4,7 +4,7 @@
 from typing import override
 
 from vcf_generator_lite.layout.vertical_dialog_layout import VerticalDialogLayout
-from vcf_generator_lite.util.tkinter.font import extend_font
+from vcf_generator_lite.util.tkinter.font import extend_font_scale
 from vcf_generator_lite.util.tkinter.widget import auto_wrap_configure_event
 from vcf_generator_lite.widget.scrolled_treeview import ScrolledTreeview
 from vcf_generator_lite.window.base import ExtendedDialog
@@ -29,7 +29,7 @@ def _create_header(self, parent: Misc):
         self.header_icon = Label(
             header_frame,
             text="\u26A0",
-            font=extend_font("TkDefaultFont", size=24),
+            font=extend_font_scale("TkDefaultFont", 24 / 9),
             style="DialogHeaderContent.TLabel"
         )
         self.header_icon.pack(side=LEFT, padx="14p", pady="7p")