From 01f68e8f9f1541393e6e069db08f834d4ef18691 Mon Sep 17 00:00:00 2001 From: Omar Zeidan Date: Mon, 11 Dec 2017 11:07:14 +0100 Subject: Fixes window getting reset to saved_rect when untiling from corner --- src/core/keybindings.c | 5 +++-- src/core/window-private.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 8006c9e1..3a54ca0d 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -3090,8 +3090,9 @@ handle_toggle_tiled (MetaDisplay *display, { MetaTileMode mode = binding->handler->data; - if ((META_WINDOW_TILED_LEFT (window) && mode == META_TILE_LEFT) || - (META_WINDOW_TILED_RIGHT (window) && mode == META_TILE_RIGHT)) + if (mode == window->tile_mode && + window->maximized_vertically && + !window->maximized_horizontally) { if (window->saved_maximize) { diff --git a/src/core/window-private.h b/src/core/window-private.h index 8ab35718..0d744faf 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -408,7 +408,7 @@ struct _MetaWindow (w)->tile_mode == META_TILE_LEFT) #define META_WINDOW_TILED_RIGHT(w) (META_WINDOW_SIDE_TILED(w) && \ (w)->tile_mode == META_TILE_RIGHT) -#define META_WINDOW_QUARTER_TILED(w) (!(w)->maximized_vertically && \ +#define META_WINDOW_QUARTER_TILED(w) ((w)->maximized_vertically && \ !(w)->maximized_horizontally && \ ((w)->tile_mode == META_TILE_BOTTOM_RIGHT || \ (w)->tile_mode == META_TILE_BOTTOM_LEFT || \ -- cgit v1.2.1