Selaa lähdekoodia

feat: 屏幕缩放可以使用小数

SongZihuan 3 vuotta sitten
vanhempi
sitoutus
d3e463c9f3
4 muutettua tiedostoa jossa 13 lisäystä ja 13 poistoa
  1. 5 5
      conf/sys_default.py
  2. 4 4
      tk_ui/admin.py
  3. 2 2
      tk_ui/ranking.py
  4. 2 2
      tk_ui/station.py

+ 5 - 5
conf/sys_default.py

@@ -57,11 +57,11 @@ class ConfigTkinterRelease:
     """ tkinter 相关配置 """
     tk_refresh_delay = int(conf_args.get("tk_refresh_delay", 50))  # 延时任务的时间
 
-    tk_zoom = int(conf_args.get("tk_zoom", 1))  # 文字缩放
-    tk_garbage_zoom = int(conf_args.get("tk_garbage_zoom", 1))  # 文字缩放
-    tk_manager_zoom = int(conf_args.get("tk_manager_zoom", 1))  # 文字缩放
-    tk_manager_login_zoom = int(conf_args.get("tk_manager_login_zoom", 1))  # 文字缩放
-    tk_ranking_zoom = int(conf_args.get("tk_ranking_zoom", 1))  # 文字缩放
+    tk_zoom = float(conf_args.get("tk_zoom", 1))  # 文字缩放
+    tk_garbage_zoom = float(conf_args.get("tk_garbage_zoom", 1))  # 文字缩放
+    tk_manager_zoom = float(conf_args.get("tk_manager_zoom", 1))  # 文字缩放
+    tk_manager_login_zoom = float(conf_args.get("tk_manager_login_zoom", 1))  # 文字缩放
+    tk_ranking_zoom = float(conf_args.get("tk_ranking_zoom", 1))  # 文字缩放
 
     tk_second_win_bg = "#fffffb"  # tkinter 第二窗口 标准颜色
     tk_win_bg = "#F0FFF0"  # tkinter 一般窗口 标准颜色 蜜瓜绿

+ 4 - 4
tk_ui/admin.py

@@ -240,8 +240,8 @@ class AdminStation(AdminStationBase):
         self._sys_height = self._window.winfo_screenheight()
         self._sys_width = self._window.winfo_screenwidth()
 
-        self._win_height = int(self._sys_height * (2 / 3)) * Config.tk_manager_zoom
-        self._win_width = int(self._sys_width * (2 / 3)) * Config.tk_manager_zoom
+        self._win_height = int(self._sys_height * (2 / 3) * Config.tk_manager_zoom)
+        self._win_width = int(self._sys_width * (2 / 3) * Config.tk_manager_zoom)
         self.__conf_windows(before_load=True)
 
         self._full_screen = False
@@ -582,11 +582,11 @@ class AdminStation(AdminStationBase):
         except TclError:
             pass
 
-        height = int(self._sys_height * (1 / 5)) * Config.tk_manager_login_zoom
+        height = int(self._sys_height * (1 / 5) * Config.tk_manager_login_zoom)
         width = int(height * 2)
 
         if width > self._sys_width:
-            width = int(self._sys_width * (2 / 3)) * Config.tk_manager_login_zoom
+            width = int(self._sys_width * (2 / 3) * Config.tk_manager_login_zoom)
             height = int(width / 2)
 
         self.login_window.geometry(f'{width}x{height}')

+ 2 - 2
tk_ui/ranking.py

@@ -204,8 +204,8 @@ class RankingStation(RankingStationBase):
         self._sys_height = self.window.winfo_screenheight()
         self._sys_width = self.window.winfo_screenwidth()
 
-        self.height = int(self._sys_height * (2 / 3)) * Config.tk_ranking_zoom
-        self.width = int(self._sys_width * (1 / 3)) * Config.tk_ranking_zoom
+        self.height = int(self._sys_height * (2 / 3) * Config.tk_ranking_zoom)
+        self.width = int(self._sys_width * (1 / 3) * Config.tk_ranking_zoom)
         self._full_screen = False
         self.__conf_windows()
 

+ 2 - 2
tk_ui/station.py

@@ -531,8 +531,8 @@ class GarbageStation(GarbageStationBase):
         self._sys_height = self._window.winfo_screenheight()
         self._sys_width = self._window.winfo_screenwidth()
 
-        self._win_height = int(self._sys_height * (2 / 3)) * Config.tk_garbage_zoom  # 窗口高度
-        self._win_width = int(self._sys_width * (2 / 3)) * Config.tk_garbage_zoom  # 窗口宽度
+        self._win_height = int(self._sys_height * (2 / 3) * Config.tk_garbage_zoom)  # 窗口高度
+        self._win_width = int(self._sys_width * (2 / 3) * Config.tk_garbage_zoom)  # 窗口宽度
         self._full_screen = False  # 是否全屏模式
 
         self.__conf_windows()