diff options
| author | Cody Russell <bratsche@gnome.org> | 2007-12-23 21:14:09 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2007-12-23 21:14:09 +0000 |
| commit | 045db5be3819a206dea47058a1ebc2b9ffee1700 (patch) | |
| tree | a5f0fc27c1f6fc85a90e932f2396479b42bb76d7 /gdk/win32 | |
| parent | bfb8d6c03c1fab0744687823321900fec64196f8 (diff) | |
| download | gtk+-045db5be3819a206dea47058a1ebc2b9ffee1700.tar.gz | |
Check that the window is mapped before setting SW_RESTORE or SW_MINIMIZE.
2007-12-23 Cody Russell <bratsche@gnome.org>
* gdk/win32/gdkevents-win32.c (show_window_recurse): Check that
the window is mapped before setting SW_RESTORE or SW_MINIMIZE.
Fixes a regression caused by #164537 patch where transient
windows that are hidden get shown (incorrectly) when their
parents are minimized. (#504984)
svn path=/trunk/; revision=19231
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 3bf526da15..a916228418 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1288,10 +1288,13 @@ show_window_recurse (GdkWindow *window, gboolean hide_window) } } - if (!hide_window) - ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); - else - ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE); + if (GDK_WINDOW_IS_MAPPED (window)) + { + if (!hide_window) + ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); + else + ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE); + } impl->changing_state = FALSE; } |