From 73e2d7049a91c30633093adb4d20cc287d0b2cee Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 1 May 2014 19:18:49 -0400 Subject: [PATCH] window: Rearrange code a tiny bit --- src/core/window.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/core/window.c b/src/core/window.c index 315aeae3c..0b699c0c9 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -3785,13 +3785,14 @@ meta_window_move_resize_internal (MetaWindow *window, g_return_if_fail (!window->override_redirect); - is_user_action = (flags & META_IS_USER_ACTION) != 0; - /* The action has to be a move, a resize or the wayland client * acking our choice of size. */ g_assert (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION | META_IS_WAYLAND_RESIZE)); + is_user_action = (flags & META_IS_USER_ACTION) != 0; + did_placement = !window->placed && window->calc_placement; + /* We don't need it in the idle queue anymore. */ meta_window_unqueue (window, META_QUEUE_MOVE_RESIZE); @@ -3815,8 +3816,6 @@ meta_window_move_resize_internal (MetaWindow *window, new_rect = requested_rect; - did_placement = !window->placed && window->calc_placement; - if (flags & (META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION)) { meta_window_client_rect_to_frame_rect (window, &old_rect, &old_rect);