[PATCH v3 0/1] MR6367: explorer: Use the EnableShell option to show or hide the taskbar.
The option is on by default with the virtual desktop, off by default otherwise, but can be forced on/off in either case, letting it hide the taskbar in virtual desktop mode too. The standalone systray window still uses the separate ShowSystray option which can be enabled when EnableShell is off. When EnableShell is on, the systray area will always be visible in the taskbar. -- v3: explorer: Use the EnableShell option to show or hide the taskbar. https://gitlab.winehq.org/wine/wine/-/merge_requests/6367
From: Rémi Bernon <rbernon(a)codeweavers.com> The restores the option behavior to its original state, where it is off by default except for the "shell" virtual desktop. It can be forced on to display a taskbar in every virtual desktop, or off to hide it in the "shell" desktop too. The standalone systray window still uses the separate ShowSystray option which can be enabled when not using virtual desktops, or if EnableShell is off. When EnableShell is on, the systray area will always be visible in the taskbar. Fixes: 118810ad3bac91bfeea81e4408059d48c158e8c5 --- programs/explorer/desktop.c | 2 -- programs/explorer/systray.c | 37 +++++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index fb59258ad36..0556bec567d 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1221,8 +1221,6 @@ void manage_desktop( WCHAR *arg ) initialize_display_settings( width, height ); initialize_appbar(); - if (using_root) enable_shell = FALSE; - initialize_systray( using_root, enable_shell, show_systray ); if (!using_root) initialize_launchers( hwnd ); diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 275c683e3ff..108691d5192 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -102,7 +102,10 @@ static HWND tray_window; static unsigned int nb_displayed; -static BOOL show_systray = TRUE, enable_shell, enable_taskbar; +static BOOL enable_taskbar; /* show full taskbar, with dedicated systray area */ +static BOOL show_systray; /* show a standalone systray window */ +static BOOL enable_dock; /* allow systray icons to be docked in the host systray */ + static int icon_cx, icon_cy, tray_width, tray_height; static int start_button_width, taskbar_button_width; static WCHAR start_label[50]; @@ -604,7 +607,7 @@ static void systray_remove_icon( struct icon *icon ) SetWindowPos( ptr->window, 0, pos.x, pos.y, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER ); } - if (!--nb_displayed && !enable_shell) do_hide_systray(); + if (!--nb_displayed && !enable_taskbar) do_hide_systray(); TRACE( "removed %u now %d icons\n", icon->id, nb_displayed ); icon->display = ICON_DISPLAY_HIDDEN; @@ -619,7 +622,7 @@ static BOOL show_icon(struct icon *icon) if (icon->display != ICON_DISPLAY_HIDDEN) return TRUE; /* already displayed */ - if (!enable_taskbar) + if (enable_dock) { DWORD old_exstyle = GetWindowLongW( icon->window, GWL_EXSTYLE ); @@ -651,8 +654,8 @@ static BOOL hide_icon(struct icon *icon) if (icon->display == ICON_DISPLAY_HIDDEN) return TRUE; /* already hidden */ - if (!enable_taskbar && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_REMOVE, 0, 0, - NULL, NtUserSystemTrayCall, FALSE )) + if (enable_dock && NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_REMOVE, 0, 0, + NULL, NtUserSystemTrayCall, FALSE )) { icon->display = ICON_DISPLAY_HIDDEN; icon->layered = FALSE; @@ -692,7 +695,7 @@ static BOOL modify_icon( struct icon *icon, NOTIFYICONDATAW *nid ) InvalidateRect( icon->window, NULL, TRUE ); else if (icon->layered) paint_layered_icon( icon ); - else if (!enable_taskbar) + else if (enable_dock) NtUserMessageCall( icon->window, WINE_SYSTRAY_DOCK_CLEAR, 0, 0, NULL, NtUserSystemTrayCall, FALSE ); } @@ -909,7 +912,7 @@ static void add_taskbar_button( HWND hwnd ) { struct taskbar_button *win; - if (!enable_taskbar || !show_systray) return; + if (!enable_taskbar) return; /* ignore our own windows */ if (hwnd) @@ -1064,7 +1067,7 @@ static LRESULT WINAPI shell_traywnd_proc( HWND hwnd, UINT msg, WPARAM wparam, LP case WM_DISPLAYCHANGE: if (!show_systray) do_hide_systray(); - else if (!nb_displayed && !enable_shell) do_hide_systray(); + else if (!nb_displayed && !enable_taskbar) do_hide_systray(); else do_show_systray(); break; @@ -1147,7 +1150,7 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) } /* this function creates the listener window */ -void initialize_systray( BOOL using_root, BOOL arg_enable_shell, BOOL arg_show_systray ) +void initialize_systray( BOOL arg_using_root, BOOL arg_enable_shell, BOOL arg_show_systray ) { RECT work_rect, primary_rect, taskbar_rect; @@ -1158,9 +1161,19 @@ void initialize_systray( BOOL using_root, BOOL arg_enable_shell, BOOL arg_show_s icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER; - show_systray = arg_show_systray; - enable_shell = arg_enable_shell; - enable_taskbar = enable_shell || !using_root; + + if (arg_using_root) + { + show_systray = arg_show_systray; + enable_taskbar = FALSE; + enable_dock = TRUE; + } + else + { + show_systray = arg_show_systray && !arg_enable_shell; + enable_taskbar = arg_enable_shell; + enable_dock = FALSE; + } /* register the systray listener window class */ if (!RegisterClassExW( &shell_traywnd_class )) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6367
On Thu Aug 29 10:33:14 2024 +0000, Rémi Bernon wrote:
changed this line in [version 3 of the diff](/wine/wine/-/merge_requests/6367/diffs?diff_id=129156&start_sha=e4cfd98ccf940dc4047196616a02061402131d1d#440d99c5689f0a3ecb23ff968832377f5a87347d_1166_1164) Right, I rearranged the conditions a bit to make it more understandable.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6367#note_80384
This merge request was approved by Alex Henrie. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6367
participants (2)
-
Alex Henrie (＠alexhenrie) -
Rémi Bernon