diff options
| author | Martin Wimpress <[email protected]> | 2015-06-10 18:21:45 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-06-10 18:21:45 +0100 |
| commit | 7770b75d007a8c303aa7bd4bdae439cc3b00d269 (patch) | |
| tree | d39ed524cb34f2292809a10b4656ae5df1cf7d9b /src/core/window.c | |
| parent | 78416ca9529b236d39e0701e40314b2484090cf9 (diff) | |
| parent | 060838853303871a9fbb1ddfe0228668318070e7 (diff) | |
| download | marco-7770b75d007a8c303aa7bd4bdae439cc3b00d269.tar.bz2 marco-7770b75d007a8c303aa7bd4bdae439cc3b00d269.tar.xz | |
Merge pull request #160 from micove/add-tile-keybinds
Add tile keybinds (Fix #104, #127)
Diffstat (limited to 'src/core/window.c')
| -rw-r--r-- | src/core/window.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/core/window.c b/src/core/window.c index 254eb094..9b2ad926 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -2670,14 +2670,9 @@ meta_window_maximize (MetaWindow *window, if (window->tile_mode != META_TILE_NONE) { saved_rect = &window->saved_rect; - window->maximized_vertically = FALSE; - } - - if (window->tile_mode != META_TILE_NONE) - { - saved_rect = &window->saved_rect; window->maximized_vertically = FALSE; + window->tile_mode = META_TILE_NONE; } meta_window_maximize_internal (window, @@ -2751,7 +2746,7 @@ meta_window_can_tile (MetaWindow *window) MetaRectangle tile_area; /*if (!META_WINDOW_ALLOWS_RESIZE (window))*/ - if (!META_WINDOW_ALLOWS_RESIZE (window)) + if (!meta_window_can_tile_maximized (window) || window->shaded) return FALSE; monitor = meta_screen_get_current_xinerama (window->screen); @@ -2780,15 +2775,6 @@ meta_window_unmaximize (MetaWindow *window, /* At least one of the two directions ought to be set */ gboolean unmaximize_horizontally, unmaximize_vertically; - /* Restore tiling if necessary */ - if (window->tile_mode == META_TILE_LEFT || - window->tile_mode == META_TILE_RIGHT) - { - window->maximized_horizontally = FALSE; - meta_window_tile (window); - return; - } - unmaximize_horizontally = directions & META_MAXIMIZE_HORIZONTAL; unmaximize_vertically = directions & META_MAXIMIZE_VERTICAL; g_assert (unmaximize_horizontally || unmaximize_vertically); |