11import logging
2+ from typing import Optional
23from settings import DEBUG
34from core .widgets .base import BaseWidget
45from core .utils .win32 .windows import WinEvent
2122SystemEventListener = None
2223logging .warning ("Failed to load Win32 System Event Listener" )
2324
24-
25+ # Missing from win32con
26+ WS_EX_NOREDIRECTIONBITMAP = 0x20_0000
27+
2528class TaskbarWidget (BaseWidget ):
2629validation_schema = VALIDATION_SCHEMA
2730update_event = pyqtSignal (int ,WinEvent )
@@ -54,7 +57,7 @@ def __init__(
5457self ._padding = container_padding
5558self ._win_info = None
5659self ._update_retry_count = 0
57-
60+
5861self ._icon_cache = dict ()
5962self .window_buttons = {}
6063self ._event_service = EventService ()
@@ -186,18 +189,15 @@ def _update_label(self, hwnd: int, win_info: dict, event: WinEvent) -> None:
186189if self ._animation ['enabled' ]:
187190self ._animate_icon (icon_label ,start_width = 0 ,end_width = icon_label .sizeHint ().width ())
188191
189-
192+
190193def _get_app_icon (self ,hwnd :int ,title :str ,process :dict ,event :WinEvent )-> QPixmap | None :
191194try :
192- if hwnd != win32gui .GetForegroundWindow ():
193- return None
194-
195195pid = process ["pid" ]
196196cache_key = (hwnd ,title ,pid ,self .dpi )
197-
197+
198198if event != WinEvent .WinEventOutOfContext :
199199self ._update_retry_count = 0
200-
200+
201201if cache_key in self ._icon_cache :
202202icon_img = self ._icon_cache [cache_key ]
203203else :
@@ -212,7 +212,7 @@ def _get_app_icon(self, hwnd: int, title: str, process: dict, event: WinEvent) -
212212if self ._update_retry_count < 10 :
213213self ._update_retry_count += 1
214214QTimer .singleShot (
215- 500 ,
215+ 500 ,
216216lambda :self ._get_app_icon (hwnd ,title ,process ,WinEvent .WinEventOutOfContext )
217217 )
218218return None
@@ -232,24 +232,25 @@ def _get_app_icon(self, hwnd: int, title: str, process: dict, event: WinEvent) -
232232if DEBUG :
233233logging .exception (f"Failed to get icons for window with HWND{ hwnd } { event } )
234234return None
235-
236-
237- def get_visible_windows (self ,hwnd :int ,win_info :dict ,event :WinEvent )-> None :
235+
236+
237+ def get_visible_windows (self ,_ :int ,win_info :dict ,event :WinEvent )-> list [ tuple [ str , int , Optional [ QPixmap ], WinEvent ]] :
238238process = win_info ['process' ]
239239def is_window_visible_on_taskbar (hwnd ):
240- if win32gui .IsWindowVisible (hwnd )and win32gui . GetWindowText ( hwnd ) :
240+ if win32gui .IsWindowVisible (hwnd ):
241241ex_style = win32gui .GetWindowLong (hwnd ,win32con .GWL_EXSTYLE )
242- if not (ex_style & win32con .WS_EX_TOOLWINDOW ):
242+ if not (ex_style & win32con .WS_EX_TOOLWINDOW or ex_style == WS_EX_NOREDIRECTIONBITMAP ):
243243return True
244244return False
245245
246246visible_windows = []
247247
248- def enum_windows_proc (hwnd ,lParam ):
248+ def enum_windows_proc (hwnd ,_ ):
249249if is_window_visible_on_taskbar (hwnd ):
250250title = win32gui .GetWindowText (hwnd )
251251icon = self ._get_app_icon (hwnd ,title ,process ,event )
252- visible_windows .append ((title ,hwnd ,icon ,process ))
252+ if title and icon :
253+ visible_windows .append ((title ,hwnd ,icon ,process ))
253254return True
254255win32gui .EnumWindows (enum_windows_proc ,None )
255256return visible_windows