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 withdraw and iconify functionality for CTk and CTkToplevel #277 #305 #302

Browse Source
This commit is contained in:
TomSchimansky
2022-08-19 00:13:00 +02:00
parent 2db46afaf0
commit d9db3b64af
5 changed files with 80 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
customtkinter/windows/ctk_tk.py
View File

@@ -52,7 +52,8 @@ class CTk(tkinter.Tk):
super().title("CTk")
self.geometry(f"{self.current_width}x{self.current_height}")
self.window_exists = False # indicates if the window is already shown through update() or mainloop()
self.state_before_windows_set_titlebar_color = None
self.window_exists = False # indicates if the window is already shown through update() or mainloop() after init
self.withdraw_called_before_window_exists = False # indicates if withdraw() was called before window is first shown through update() or mainloop()
self.iconify_called_before_window_exists = False # indicates if iconify() was called before window is first shown through update() or mainloop()
@@ -121,7 +122,9 @@ class CTk(tkinter.Tk):
self.window_exists = True
if not self.withdraw_called_before_window_exists and not self.iconify_called_before_window_exists:
# print("window dont exists -> deiconify in update")
self.deiconify()
super().update()
def mainloop(self, *args, **kwargs):
@@ -129,7 +132,9 @@ class CTk(tkinter.Tk):
self.window_exists = True
if not self.withdraw_called_before_window_exists and not self.iconify_called_before_window_exists:
# print("window dont exists -> deiconify in mainloop")
self.deiconify()
super().mainloop(*args, **kwargs)
def resizable(self, *args, **kwargs):
@@ -279,8 +284,15 @@ class CTk(tkinter.Tk):
if sys.platform.startswith("win") and not Settings.deactivate_windows_window_header_manipulation:
super().withdraw() # hide window so that it can be redrawn after the titlebar change so that the color change is visible
if not self.window_exists:
if self.window_exists:
self.state_before_windows_set_titlebar_color = self.state()
# print("window_exists -> state_before_windows_set_titlebar_color: ", self.state_before_windows_set_titlebar_color)
if self.state_before_windows_set_titlebar_color != "iconic" or self.state_before_windows_set_titlebar_color != "withdrawn":
super().withdraw() # hide window so that it can be redrawn after the titlebar change so that the color change is visible
else:
# print("window dont exists -> withdraw and update")
super().withdraw()
super().update()
if color_mode.lower() == "dark":
@@ -309,7 +321,17 @@ class CTk(tkinter.Tk):
print(err)
if self.window_exists:
self.deiconify()
# print("window_exists -> return to original state: ", self.state_before_windows_set_titlebar_color)
if self.state_before_windows_set_titlebar_color == "normal":
self.deiconify()
elif self.state_before_windows_set_titlebar_color == "iconic":
self.iconify()
elif self.state_before_windows_set_titlebar_color == "zoomed":
self.state("zoomed")
else:
self.state(self.state_before_windows_set_titlebar_color) # other states
else:
pass # wait for update or mainloop to be called
def set_appearance_mode(self, mode_string):
if mode_string.lower() == "dark":

41
customtkinter/windows/ctk_toplevel.py
View File

@@ -48,6 +48,11 @@ class CTkToplevel(tkinter.Toplevel):
super().configure(bg=ThemeManager.single_color(self.fg_color, self.appearance_mode))
super().title("CTkToplevel")
self.state_before_windows_set_titlebar_color = None
self.windows_set_titlebar_color_called = False # indicates if windows_set_titlebar_color was called, stays True until revert_withdraw_after_windows_set_titlebar_color is called
self.withdraw_called_after_windows_set_titlebar_color = False # indicates if withdraw() was called after windows_set_titlebar_color
self.iconify_called_after_windows_set_titlebar_color = False # indicates if iconify() was called after windows_set_titlebar_color
if sys.platform.startswith("win"):
if self.appearance_mode == 1:
self.windows_set_titlebar_color("dark")
@@ -143,6 +148,16 @@ class CTkToplevel(tkinter.Toplevel):
self.disable_macos_dark_title_bar()
super().destroy()
def withdraw(self):
if self.windows_set_titlebar_color_called:
self.withdraw_called_after_windows_set_titlebar_color = True
super().withdraw()
def iconify(self):
if self.windows_set_titlebar_color_called:
self.iconify_called_after_windows_set_titlebar_color = True
super().iconify()
def resizable(self, *args, **kwargs):
super().resizable(*args, **kwargs)
self.last_resizable_args = (args, kwargs)
@@ -234,6 +249,7 @@ class CTkToplevel(tkinter.Toplevel):
if sys.platform.startswith("win") and not Settings.deactivate_windows_window_header_manipulation:
self.state_before_windows_set_titlebar_color = self.state()
super().withdraw() # hide window so that it can be redrawn after the titlebar change so that the color change is visible
super().update()
@@ -261,7 +277,30 @@ class CTkToplevel(tkinter.Toplevel):
except Exception as err:
print(err)
self.deiconify()
self.windows_set_titlebar_color_called = True
self.after(5, self.revert_withdraw_after_windows_set_titlebar_color)
def revert_withdraw_after_windows_set_titlebar_color(self):
""" if in a short time (5ms) after """
if self.windows_set_titlebar_color_called:
if self.withdraw_called_after_windows_set_titlebar_color:
pass # leave it withdrawed
elif self.iconify_called_after_windows_set_titlebar_color:
super().iconify()
else:
if self.state_before_windows_set_titlebar_color == "normal":
self.deiconify()
elif self.state_before_windows_set_titlebar_color == "iconic":
self.iconify()
elif self.state_before_windows_set_titlebar_color == "zoomed":
self.state("zoomed")
else:
self.state(self.state_before_windows_set_titlebar_color) # other states
self.windows_set_titlebar_color_called = False
self.withdraw_called_after_windows_set_titlebar_color = False
self.iconify_called_after_windows_set_titlebar_color = False
def set_appearance_mode(self, mode_string):
if mode_string.lower() == "dark":