mirror/CustomTkinter
1
0
Fork 0
mirror of https://github.com/TomSchimansky/CustomTkinter.git synced 2023-08-10 21:13:13 +03:00
Code Issues Projects Releases Wiki Activity

fixed geometry string scaling

Browse Source
This commit is contained in:
Tom Schimansky
2022-05-30 17:20:27 +02:00
parent 60b13bf215
commit 940ed128bd
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
customtkinter/__init__.py
View File

@ -3,6 +3,7 @@ __version__ = "4.1.0"
import os
import sys
from tkinter.constants import *
from tkinter import StringVar, IntVar, DoubleVar, BooleanVar
# import manager classes
from .settings import Settings

13
customtkinter/windows/ctk_tk.py
View File

@ -138,18 +138,7 @@ class CTk(tkinter.Tk):
self.current_height = max(self.min_height, min(numbers[1], self.max_height))
def apply_geometry_scaling(self, geometry_string):
numbers = list(map(int, re.split(r"[x+]", geometry_string))) # split geometry string into list of numbers
if len(numbers) == 2:
return f"{self.apply_window_scaling(numbers[0]):.0f}x" +\
f"{self.apply_window_scaling(numbers[1]):.0f}"
elif len(numbers) == 4:
return f"{self.apply_window_scaling(numbers[0]):.0f}x" +\
f"{self.apply_window_scaling(numbers[1]):.0f}+" +\
f"{self.apply_window_scaling(numbers[2]):.0f}+" +\
f"{self.apply_window_scaling(numbers[3]):.0f}"
else:
return geometry_string
return re.sub(re.compile("\d+"), lambda match_obj: str(round(int(match_obj.group(0)) * self.window_scaling)), geometry_string)
def apply_window_scaling(self, value):
if isinstance(value, (int, float)):