summaryrefslogtreecommitdiff
path: root/gdk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-11-03 22:38:29 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-11-03 22:38:29 +0000
commit74aeac9e66403edfc2974048aba518b78ffc1fa6 (patch)
tree31f56a02e67ad203f2fee3a59ca06a61d13e003d /gdk
parentd06e67023cf779f7af3e508de64ac1316ec08508 (diff)
downloadgtk+-74aeac9e66403edfc2974048aba518b78ffc1fa6.tar.gz
Bug 557212 - Problem with which window gains focus and is visible
2008-11-04 Tor Lillqvist <tml@novell.com> Bug 557212 - Problem with which window gains focus and is visible * gdk/win32/gdkevents-win32.c (ensure_stacking_on_activate_app): Only do the restacking for the active window of the application. Seems to fix the problem. (gdk_event_translate): Only call ensure_stacking_on_activate_app() when the application is being activated, not deactivated. svn path=/trunk/; revision=21756
Diffstat (limited to 'gdk')
-rw-r--r--gdk/win32/gdkevents-win32.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 686e0fe527..07e68b4597 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2214,12 +2214,12 @@ ensure_stacking_on_activate_app (MSG *msg,
}
if (IsWindowVisible (msg->hwnd) &&
- gdk_win32_handle_table_lookup (GetActiveWindow ()))
+ msg->hwnd == GetActiveWindow ())
{
- /* This window is not a transient-type window and this or some
- * other window in this app is the active window. Make sure this
- * window is as visible as possible, just below the lowest
- * transient-type window of this app.
+ /* This window is not a transient-type window and it is the
+ * activated window. Make sure this window is as visible as
+ * possible, just below the lowest transient-type window of this
+ * app.
*/
HWND rover;
@@ -3680,7 +3680,7 @@ gdk_event_translate (MSG *msg,
msg->wParam ? "YES" : "NO",
(gint64) msg->lParam));
- if (GDK_WINDOW_IS_MAPPED (window))
+ if (msg->wParam && GDK_WINDOW_IS_MAPPED (window))
ensure_stacking_on_activate_app (msg, window);
break;