callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if the window's state has GDK_WINDOW_STATE_MAXIMIZED set before

Browse Source 
2008-08-27  Cody Russell  <bratsche@gnome.org>

        * gdk/win32/gdkevents-win32.c:
        * gdk/win32/gdkwindow-win32.c (show_window_recurse): Check if
        the window's state has GDK_WINDOW_STATE_MAXIMIZED set before
        calling ShowWindow (), and show using SW_SHOWMAXIMIZED or     
        SW_RESTORE accordingly.  This fixes an issue where maximized 
        windows that are iconified do not restore back to maximized 
        when you click the taskbar. (#528975)


svn path=/trunk/; revision=21218
This commit is contained in:
Cody Russell
2008-08-28 02:42:23 +00:00
committed by Cody Russell
parent 3f53433008
commit 1c146ec11f
3 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-08-27 Cody Russell <bratsche@gnome.org>
* gdk/win32/gdkevents-win32.c:
* gdk/win32/gdkwindow-win32.c (show_window_recurse): Check if
the window's state has GDK_WINDOW_STATE_MAXIMIZED set before
calling ShowWindow (), and show using SW_SHOWMAXIMIZED or
SW_RESTORE accordingly. This fixes an issue where maximized
windows that are iconified do not restore back to maximized
when you click the taskbar. (#528975)
2008-08-27 Matthias Clasen <mclasen@redhat.com> 2008-08-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation.c: Documentation fixes. * gtk/gtkprintoperation.c: Documentation fixes.

22
gdk/win32/gdkevents-win32.c
View File

@ -1304,7 +1304,14 @@ show_window_recurse (GdkWindow *window, gboolean hide_window)
{ {
if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_ICONIFIED) if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_ICONIFIED)
{ {
ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_MAXIMIZED)
{
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
}
else
{
ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
}
} }
} }
else else
@ -1318,7 +1325,7 @@ show_window_recurse (GdkWindow *window, gboolean hide_window)
} }
static void static void
show_window_internal (GdkWindow *window, gboolean hide_window) do_show_window (GdkWindow *window, gboolean hide_window)
{ {
GdkWindow *tmp_window = NULL; GdkWindow *tmp_window = NULL;
GdkWindowImplWin32 *tmp_impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl); GdkWindowImplWin32 *tmp_impl = GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl);
@ -1339,7 +1346,10 @@ show_window_internal (GdkWindow *window, gboolean hide_window)
} }
/* Recursively show/hide every window in the chain. */ /* Recursively show/hide every window in the chain. */
show_window_recurse (tmp_window, hide_window); if (tmp_window != window)
{
show_window_recurse (tmp_window, hide_window);
}
} }
} }
@ -2922,7 +2932,7 @@ gdk_event_translate (MSG *msg,
{ {
case SC_MINIMIZE: case SC_MINIMIZE:
case SC_RESTORE: case SC_RESTORE:
show_window_internal (window, msg->wParam == SC_MINIMIZE ? TRUE : FALSE); do_show_window (window, msg->wParam == SC_MINIMIZE ? TRUE : FALSE);
break; break;
} }
@ -2951,7 +2961,7 @@ gdk_event_translate (MSG *msg,
gdk_synthesize_window_state (window, gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_WITHDRAWN, GDK_WINDOW_STATE_WITHDRAWN,
GDK_WINDOW_STATE_ICONIFIED); GDK_WINDOW_STATE_ICONIFIED);
show_window_internal (window, TRUE); do_show_window (window, TRUE);
} }
else if ((msg->wParam == SIZE_RESTORED || else if ((msg->wParam == SIZE_RESTORED ||
msg->wParam == SIZE_MAXIMIZED) && msg->wParam == SIZE_MAXIMIZED) &&
@ -2973,7 +2983,7 @@ gdk_event_translate (MSG *msg,
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP && !GDK_WINDOW_IS_MAPPED (window)) if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP && !GDK_WINDOW_IS_MAPPED (window))
{ {
show_window_internal (window, FALSE); do_show_window (window, FALSE);
} }
} }
else if (msg->wParam == SIZE_MAXIMIZED) else if (msg->wParam == SIZE_MAXIMIZED)

40
gdk/win32/gdkwindow-win32.c
View File

@ -1106,15 +1106,25 @@ show_window_internal (GdkWindow *window,
} }
if (private->state & GDK_WINDOW_STATE_FULLSCREEN) if (private->state & GDK_WINDOW_STATE_FULLSCREEN)
gdk_window_fullscreen (window); {
gdk_window_fullscreen (window);
}
else if (private->state & GDK_WINDOW_STATE_MAXIMIZED) else if (private->state & GDK_WINDOW_STATE_MAXIMIZED)
ShowWindow (GDK_WINDOW_HWND (window), SW_MAXIMIZE); {
ShowWindow (GDK_WINDOW_HWND (window), SW_MAXIMIZE);
}
else if (private->state & GDK_WINDOW_STATE_ICONIFIED) else if (private->state & GDK_WINDOW_STATE_ICONIFIED)
ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE); {
ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
}
else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || !focus_on_map) else if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP || !focus_on_map)
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNOACTIVATE); {
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNOACTIVATE);
}
else else
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL); {
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
}
if (raise) if (raise)
{ {
@ -1126,17 +1136,25 @@ show_window_internal (GdkWindow *window,
GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG) GDK_WINDOW_TYPE (window) == GDK_WINDOW_DIALOG)
{ {
if (focus_on_map && private->accept_focus) if (focus_on_map && private->accept_focus)
SetForegroundWindow (GDK_WINDOW_HWND (window)); {
SetForegroundWindow (GDK_WINDOW_HWND (window));
}
else else
SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOP, {
0, 0, 0, 0, SetWindowPos (GDK_WINDOW_HWND (window), HWND_TOP,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); 0, 0, 0, 0,
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
}
} }
else else
BringWindowToTop (GDK_WINDOW_HWND (window)); {
BringWindowToTop (GDK_WINDOW_HWND (window));
}
} }
else if (old_active_window != GDK_WINDOW_HWND (window)) else if (old_active_window != GDK_WINDOW_HWND (window))
SetActiveWindow (old_active_window); {
SetActiveWindow (old_active_window);
}
} }
static void static void