brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window-x11: Keep flags where they're used

Browse Source 
Just a simple code cleanup
This commit is contained in:
Jasper St. Pierre 2014-05-28 11:43:11 -04:00
parent f3f3c94831
commit a8df208a5c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/x11/window-x11.c
View File

@ -501,7 +501,6 @@ static void
meta_window_x11_manage (MetaWindow *window) meta_window_x11_manage (MetaWindow *window)
{ {
MetaDisplay *display = window->display; MetaDisplay *display = window->display;
MetaMoveResizeFlags flags;
meta_display_register_x_window (display, &window->xwindow, window); meta_display_register_x_window (display, &window->xwindow, window);
meta_window_x11_update_shape_region (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 * passing TRUE for is_configure_request, ICCCM says
* initial map is handled same as configure request * 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) if (!window->override_redirect)
{ {
MetaRectangle rect; MetaRectangle rect;
MetaMoveResizeFlags flags;
int gravity = window->size_hints.win_gravity; int gravity = window->size_hints.win_gravity;
rect.x = window->size_hints.x; rect.x = window->size_hints.x;
@ -547,6 +546,8 @@ meta_window_x11_manage (MetaWindow *window)
rect.width = window->size_hints.width; rect.width = window->size_hints.width;
rect.height = window->size_hints.height; 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); adjust_for_gravity (window, TRUE, gravity, &rect);
meta_window_client_rect_to_frame_rect (window, &rect, &rect); meta_window_client_rect_to_frame_rect (window, &rect, &rect);
meta_window_move_resize_internal (window, flags, gravity, rect); meta_window_move_resize_internal (window, flags, gravity, rect);