ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-13 22:02:22 +03:00
Code Issues Projects Releases Wiki Activity

systray: Now correctly minimising to systray if required

Browse Source
This commit is contained in:
Athanasius 2021-11-12 14:23:18 +00:00
parent ac824ceb13
commit 29461dd6e3
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
EDMarketConnector.py
View File

@ -434,6 +434,7 @@ class AppWindow(object):
self.w = master self.w = master
self.w.title(applongname) self.w.title(applongname)
self.minimizing = False
self.w.rowconfigure(0, weight=1) self.w.rowconfigure(0, weight=1)
self.w.columnconfigure(0, weight=1) self.w.columnconfigure(0, weight=1)
@ -613,6 +614,10 @@ class AppWindow(object):
command=self.ontop_changed) # Appearance setting command=self.ontop_changed) # Appearance setting
self.menubar.add_cascade(menu=self.system_menu) self.menubar.add_cascade(menu=self.system_menu)
self.w.bind('<Control-c>', self.copy) self.w.bind('<Control-c>', self.copy)
# Bind to the Default theme minimise button
self.w.bind("<Unmap>", self.default_iconify)
self.w.protocol("WM_DELETE_WINDOW", self.onexit) self.w.protocol("WM_DELETE_WINDOW", self.onexit)
theme.register(self.menubar) # menus and children aren't automatically registered theme.register(self.menubar) # menus and children aren't automatically registered
theme.register(self.file_menu) theme.register(self.file_menu)
@ -1746,16 +1751,20 @@ class AppWindow(object):
"""Handle end of window dragging.""" """Handle end of window dragging."""
self.drag_offset = (None, None) self.drag_offset = (None, None)
def default_iconify(self, event=None) -> None:
"""Handle the Windows default theme 'minimise' button."""
# If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen
if config.get_bool('minimize_system_tray'):
# This gets called for more than the root widget, so only react to that
if str(event.widget) == '.':
self.w.withdraw()
def oniconify(self, event=None) -> None: def oniconify(self, event=None) -> None:
"""Handle minimization of the application.""" """Handle the minimize button on non-Default theme main window."""
self.w.overrideredirect(False) # Can't iconize while overrideredirect self.w.overrideredirect(False) # Can't iconize while overrideredirect
self.w.iconify() self.w.iconify()
self.w.update_idletasks() # Size and windows styles get recalculated here self.w.update_idletasks() # Size and windows styles get recalculated here
# If we're meant to "minimize to system tray" then hide the window so no taskbar icon is seen
if config.get_bool('minimize_system_tray'):
self.w.withdraw()
self.w.wait_visibility() # Need main window to be re-created before returning self.w.wait_visibility() # Need main window to be re-created before returning
theme.active = None # So theme will be re-applied on map theme.active = None # So theme will be re-applied on map