Commit 5e1e682a authored by Alexandre Julliard's avatar Alexandre Julliard

explorer: Fix hiding the taskbar when there are no system tray items.

parent 41d01871
...@@ -118,6 +118,7 @@ static HWND balloon_window; ...@@ -118,6 +118,7 @@ static HWND balloon_window;
#define WM_POPUPSYSTEMMENU 0x0313 #define WM_POPUPSYSTEMMENU 0x0313
static void do_hide_systray(void);
static void do_show_systray(void); static void do_show_systray(void);
/* Retrieves icon record by owner window and ID */ /* Retrieves icon record by owner window and ID */
...@@ -366,7 +367,7 @@ static BOOL hide_icon(struct icon *icon) ...@@ -366,7 +367,7 @@ static BOOL hide_icon(struct icon *icon)
invalidate_icons( icon->display, nb_displayed ); invalidate_icons( icon->display, nb_displayed );
icon->display = -1; icon->display = -1;
if (!nb_displayed && !enable_shell) ShowWindow( tray_window, SW_HIDE ); if (!nb_displayed && !enable_shell) do_hide_systray();
update_balloon( icon ); update_balloon( icon );
update_tooltip_position( icon ); update_tooltip_position( icon );
...@@ -747,7 +748,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l ...@@ -747,7 +748,7 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l
return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam); return handle_incoming((HWND)wparam, (COPYDATASTRUCT *)lparam);
case WM_DISPLAYCHANGE: case WM_DISPLAYCHANGE:
if (hide_systray) do_hide_systray(); if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray();
else do_show_systray(); else do_show_systray();
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment