summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-12-07 06:33:30 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-12-07 06:33:30 +0000
commit8c8d50049539b69c24a95a7b6d08741e05f34026 (patch)
tree8fb4dd587fba2516690384bd5d4bc349694e9ac3 /src
parente312daffd506aaabc63acc65471041c16b7339a8 (diff)
downloadmetacity-8c8d50049539b69c24a95a7b6d08741e05f34026.tar.gz
metacity-8c8d50049539b69c24a95a7b6d08741e05f34026.tar.bz2
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.
Diffstat (limited to 'src')
-rw-r--r--src/window.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/window.c b/src/window.c
index aa17a8c..99c5e16 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1133,6 +1133,9 @@ meta_window_minimize (MetaWindow *window)
void
meta_window_unminimize (MetaWindow *window)
{
+ if (window->display->showing_desktop)
+ meta_display_unshow_desktop (window->display);
+
if (window->minimized)
{
window->minimized = FALSE;