Paul Gofman : winex11.drv: Do not skip taskbar and pager for app window.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cb87c14fecad5a73ebd3aad8c88fab9648675f3d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/cb87c14fecad5a73ebd3aad8c88fab9...

Author: Paul Gofman <pgofman(a)codeweavers.com>
Date:   Tue Sep 27 18:43:04 2022 -0500

winex11.drv: Do not skip taskbar and pager for app window.

---

 dlls/winex11.drv/window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index a7030f69759..c0c6e779772 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -998,7 +998,8 @@ void update_net_wm_states( struct x11drv_win_data *data )
         new_state |= (1 << NET_WM_STATE_ABOVE);
     if (!data->add_taskbar)
     {
-        if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)))
+        if (data->skip_taskbar || (ex_style & WS_EX_NOACTIVATE)
+            || (ex_style & WS_EX_TOOLWINDOW && !(ex_style & WS_EX_APPWINDOW)))
             new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER);
         else if (!(ex_style & WS_EX_APPWINDOW) && NtUserGetWindowRelative( data->hwnd, GW_OWNER ))
             new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR);