isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow breaking out from tiling during a mouse resize

Browse Source 
Extend the code which allows resizing maximized windows using
alt-middle-drag, so that it applies to tiled windows as well.

https://bugzilla.gnome.org/show_bug.cgi?id=629931
This commit is contained in:
Florian Müllner 2010-09-19 16:54:08 +02:00
parent 1c3f7c4088
commit 635e20d057
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/window.c
View File

@ -3260,14 +3260,6 @@ meta_window_unmaximize_internal (MetaWindow *window,
g_return_if_fail (!window->override_redirect); g_return_if_fail (!window->override_redirect);
/* Restore tiling if necessary */
if (window->tile_mode != META_TILE_NONE)
{
window->maximized_horizontally = FALSE;
meta_window_tile (window);
return;
}
/* At least one of the two directions ought to be set */ /* At least one of the two directions ought to be set */
unmaximize_horizontally = directions & META_MAXIMIZE_HORIZONTAL; unmaximize_horizontally = directions & META_MAXIMIZE_HORIZONTAL;
unmaximize_vertically = directions & META_MAXIMIZE_VERTICAL; unmaximize_vertically = directions & META_MAXIMIZE_VERTICAL;
@ -3375,6 +3367,14 @@ void
meta_window_unmaximize (MetaWindow *window, meta_window_unmaximize (MetaWindow *window,
MetaMaximizeFlags directions) MetaMaximizeFlags directions)
{ {
/* Restore tiling if necessary */
if (window->tile_mode != META_TILE_NONE)
{
window->maximized_horizontally = FALSE;
meta_window_tile (window);
return;
}
meta_window_unmaximize_internal (window, directions, &window->saved_rect, meta_window_unmaximize_internal (window, directions, &window->saved_rect,
NorthWestGravity); NorthWestGravity);
} }
@ -3384,6 +3384,8 @@ meta_window_unmaximize (MetaWindow *window,
* determines the positioning relationship between the area occupied * determines the positioning relationship between the area occupied
* maximized and the new are. The arguments are similar to * maximized and the new are. The arguments are similar to
* meta_window_resize_with_gravity(). * meta_window_resize_with_gravity().
* Unlike meta_window_unmaximize(), tiling is not restored for windows
* with a tile mode other than META_TILE_NONE.
*/ */
void void
meta_window_unmaximize_with_gravity (MetaWindow *window, meta_window_unmaximize_with_gravity (MetaWindow *window,
@ -7936,6 +7938,7 @@ check_resize_unmaximize(MetaWindow *window,
new_unmaximize = 0; new_unmaximize = 0;
if (window->maximized_horizontally || if (window->maximized_horizontally ||
window->tile_mode != META_TILE_NONE ||
(window->display->grab_resize_unmaximize & META_MAXIMIZE_HORIZONTAL) != 0) (window->display->grab_resize_unmaximize & META_MAXIMIZE_HORIZONTAL) != 0)
{ {
int x_amount; int x_amount;
@ -8415,6 +8418,17 @@ meta_window_handle_mouse_grab_op_event (MetaWindow *window,
TRUE); TRUE);
if (window->display->compositor) if (window->display->compositor)
meta_compositor_set_updates (window->display->compositor, window, TRUE); meta_compositor_set_updates (window->display->compositor, window, TRUE);
/* If a tiled window has been dragged free with a
* mouse resize without snapping back to the tiled
* state, it will end up with an inconsistent tile
* mode on mouse release; cleaning the mode earlier
* would break the ability to snap back to the tiled
* state, so we wait until mouse release.
*/
if (!window->maximized_vertically &&
window->tile_mode != META_TILE_NONE)
window->tile_mode = META_TILE_NONE;
} }
} }