summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorOmar Zeidan <[email protected]>2017-12-19 20:38:03 +0100
committerraveit65 <[email protected]>2017-12-20 20:42:12 +0100
commitd8ef314fda4caf147162817bae4274910e9abc31 (patch)
tree48a095718086e9bac29824f3e07c635db6ecdf50 /src/core
parent6219f8e8bcaeefb9185a3c3f5f20de4e2fa8f18f (diff)
downloadmarco-d8ef314fda4caf147162817bae4274910e9abc31.tar.bz2
marco-d8ef314fda4caf147162817bae4274910e9abc31.tar.xz
Fixes windows not going to save_rect when unmaximimizing
Diffstat (limited to 'src/core')
-rw-r--r--src/core/keybindings.c4
-rw-r--r--src/core/window.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 0c9a5e27..388c723f 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -3156,7 +3156,9 @@ handle_unmaximize (MetaDisplay *display,
XEvent *event,
MetaKeyBinding *binding)
{
- if (window->maximized_vertically || window->maximized_horizontally)
+ if (window->maximized_vertically ||
+ window->maximized_horizontally ||
+ META_WINDOW_CORNER_TILED((window)))
meta_window_unmaximize (window,
META_MAXIMIZE_HORIZONTAL |
META_MAXIMIZE_VERTICAL);
diff --git a/src/core/window.c b/src/core/window.c
index 86bca3ec..92e230a0 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -2789,6 +2789,8 @@ meta_window_unmaximize (MetaWindow *window,
if (unmaximize_horizontally && unmaximize_vertically)
window->saved_maximize = FALSE;
+ window->tile_mode = META_TILE_NONE;
+
/* Only do something if the window isn't already maximized in the
* given direction(s).
*/