when unminimizing an app, if we're in "show desktop" (all windows

2001-12-07  Havoc Pennington  <hp@pobox.com>

	* src/window.c (meta_window_unminimize): when unminimizing an app,
	if we're in "show desktop" (all windows minimized) mode, leave
	show desktop mode. Will occasionally be a bit weird, but allows
	people to recover via task list if they accidentally do the show
	desktop thing, and don't know what's going on.
This commit is contained in:
Havoc Pennington 2001-12-07 06:33:30 +00:00 committed by Havoc Pennington
parent e312daffd5
commit 8c8d500495
2 changed files with 11 additions and 0 deletions

View File

@ -1,3 +1,11 @@
2001-12-07 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_unminimize): when unminimizing an app,
if we're in "show desktop" (all windows minimized) mode, leave
show desktop mode. Will occasionally be a bit weird, but allows
people to recover via task list if they accidentally do the show
desktop thing, and don't know what's going on.
2001-12-06 Havoc Pennington <hp@redhat.com> 2001-12-06 Havoc Pennington <hp@redhat.com>
* src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup * src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup

View File

@ -1133,6 +1133,9 @@ meta_window_minimize (MetaWindow *window)
void void
meta_window_unminimize (MetaWindow *window) meta_window_unminimize (MetaWindow *window)
{ {
if (window->display->showing_desktop)
meta_display_unshow_desktop (window->display);
if (window->minimized) if (window->minimized)
{ {
window->minimized = FALSE; window->minimized = FALSE;