isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "window-wayland: Don't enter the only-moving path for Wayland

Browse Source 
resizes"

We're going to use the old code structure now.

This reverts commit 23ae11043f.
This commit is contained in:
Jasper St. Pierre 2014-04-28 16:21:06 -04:00
parent e94f169d4e
commit 647743aa5f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wayland/window-wayland.c
View File

@ -120,7 +120,6 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
MetaMoveResizeResultFlags *result) MetaMoveResizeResultFlags *result)
{ {
gboolean should_move = FALSE; gboolean should_move = FALSE;
gboolean is_wayland_resize = FALSE;
g_assert (window->frame == NULL); g_assert (window->frame == NULL);
@ -134,9 +133,7 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
* it can be for maximized or fullscreen. * it can be for maximized or fullscreen.
*/ */
is_wayland_resize = (flags & META_IS_WAYLAND_RESIZE); if (flags & META_IS_WAYLAND_RESIZE)
if (is_wayland_resize)
{ {
/* This is a call to wl_surface_commit(), ignore the constrained_rect and /* This is a call to wl_surface_commit(), ignore the constrained_rect and
* update the real client size to match the buffer size. * update the real client size to match the buffer size.
@ -158,7 +155,7 @@ meta_window_wayland_move_resize_internal (MetaWindow *window,
constrained_rect.width, constrained_rect.width,
constrained_rect.height); constrained_rect.height);
} }
else if (!is_wayland_resize) else
{ {
/* We're just moving the window, so we don't need to wait for a configure /* We're just moving the window, so we don't need to wait for a configure
* and then ack to simply move the window. */ * and then ack to simply move the window. */