summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoaquín Ignacio Aramendía <[email protected]>2014-06-24 12:05:25 -0300
committerJoaquín Ignacio Aramendía <[email protected]>2014-06-26 20:26:23 -0300
commit4f08084b0ff11e1a7ebbdd5385fd6b2969b7f36e (patch)
treee6ea0323a038bab8832bdf0dd84ce24dc51e482f /src
parent25fc06391ca02c65dd9830e03a729a68f66c3220 (diff)
downloadmarco-4f08084b0ff11e1a7ebbdd5385fd6b2969b7f36e.tar.bz2
marco-4f08084b0ff11e1a7ebbdd5385fd6b2969b7f36e.tar.xz
Bugfix: If the window shown was minimized, grab focus.
Diffstat (limited to 'src')
-rw-r--r--src/core/window.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 2b7a867e..631229b7 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2353,6 +2353,11 @@ meta_window_show (MetaWindow *window)
meta_display_increment_focus_sentinel (window->display);
}
}
+ else if (window->was_minimized)
+ {
+ window->was_minimized = FALSE;
+ meta_window_focus(window, timestamp);
+ }
set_net_wm_state (window);