From a8df208a5c2c76d97ed187c93f31e521a8b6f306 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 28 May 2014 11:43:11 -0400 Subject: [PATCH] window-x11: Keep flags where they're used Just a simple code cleanup --- src/x11/window-x11.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 7f1d4fb82..7acb84677 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -501,7 +501,6 @@ static void meta_window_x11_manage (MetaWindow *window) { MetaDisplay *display = window->display; - MetaMoveResizeFlags flags; meta_display_register_x_window (display, &window->xwindow, window); meta_window_x11_update_shape_region (window); @@ -536,10 +535,10 @@ meta_window_x11_manage (MetaWindow *window) * passing TRUE for is_configure_request, ICCCM says * initial map is handled same as configure request */ - flags = META_IS_CONFIGURE_REQUEST | META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION; if (!window->override_redirect) { MetaRectangle rect; + MetaMoveResizeFlags flags; int gravity = window->size_hints.win_gravity; rect.x = window->size_hints.x; @@ -547,6 +546,8 @@ meta_window_x11_manage (MetaWindow *window) rect.width = window->size_hints.width; rect.height = window->size_hints.height; + flags = META_IS_CONFIGURE_REQUEST | META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION; + adjust_for_gravity (window, TRUE, gravity, &rect); meta_window_client_rect_to_frame_rect (window, &rect, &rect); meta_window_move_resize_internal (window, flags, gravity, rect);