wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

winex11-_NET_ACTIVE_WINDOW: Update patchset.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-04-06 18:51:03 +02:00
parent 49ea937be3
commit 640d075440
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -7541,8 +7541,10 @@ fi
# |
if test "$enable_winex11__NET_ACTIVE_WINDOW" -eq 1; then
patch_apply winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch
patch_apply winex11-_NET_ACTIVE_WINDOW/0002-user32-Before-asking-a-WM-to-activate-a-window-make-.patch
(
echo '+ { "Dmitry Timoshkov", "winex11.drv: Add support for _NET_ACTIVE_WINDOW.", 1 },';
echo '+ { "Dmitry Timoshkov", "user32: Before asking a WM to activate a window make sure that the window is in foreground and not minimized.", 1 },';
) >> "$patchlist"
fi

31
patches/winex11-_NET_ACTIVE_WINDOW/0002-user32-Before-asking-a-WM-to-activate-a-window-make-.patch Normal file
View File

@ -0,0 +1,31 @@
From 731298c0bd68f8ff4368a119cdb5e8e7fe0d0950 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 6 Apr 2016 15:14:25 +0800
Subject: user32: Before asking a WM to activate a window make sure that the
window is in foreground and not minimized.
This patch fixes iconify action using WM's taskbar buttons for Winamp.
---
dlls/user32/focus.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c
index 1c705d5..d52c3f5 100644
--- a/dlls/user32/focus.c
+++ b/dlls/user32/focus.c
@@ -154,9 +154,10 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus )
SendMessageW( hwnd, WM_ACTIVATE,
MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ),
(LPARAM)previous );
- }
- USER_Driver->pSetActiveWindow( hwnd );
+ if (hwnd == GetForegroundWindow() && !IsIconic( hwnd ))
+ USER_Driver->pSetActiveWindow( hwnd );
+ }
/* now change focus if necessary */
if (focus)
--
2.7.1