diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-05-28 11:45:36 -0400 |
---|---|---|
committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-05-28 11:47:14 -0400 |
commit | 1fe5b3e7d5c40870d45a481fc96f70bda372c2de (patch) | |
tree | 3fd3496877ac6329381df2782d5b4968871be6cc | |
parent | a8df208a5c2c76d97ed187c93f31e521a8b6f306 (diff) | |
download | mutter-1fe5b3e7d5c40870d45a481fc96f70bda372c2de.tar.gz |
window: Construct the frame before the initial move_resize
This ensures sure that the initial ConfigureRequest we make is
correct.
-rw-r--r-- | src/core/window.c | 6 | ||||
-rw-r--r-- | src/x11/window-x11.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/window.c b/src/core/window.c index 22161e37a..fe27306a5 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -1044,9 +1044,6 @@ _meta_window_shared_new (MetaDisplay *display, if (window->attached) meta_window_recalc_features (window); - if (window->decorated) - meta_window_ensure_frame (window); - if (window->type == META_WINDOW_DESKTOP || window->type == META_WINDOW_DOCK) { @@ -1393,9 +1390,6 @@ meta_window_unmanage (MetaWindow *window, META_WINDOW_GET_CLASS (window)->unmanage (window); - if (window->frame) - meta_window_destroy_frame (window); - meta_prefs_remove_listener (prefs_changed_callback, window); meta_screen_queue_check_fullscreen (window->screen); diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 7acb84677..4bf253742 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -518,6 +518,9 @@ meta_window_x11_manage (MetaWindow *window) meta_window_x11_update_net_wm_type (window); + if (window->decorated) + meta_window_ensure_frame (window); + /* Now try applying saved stuff from the session */ { const MetaWindowSessionInfo *info; @@ -647,6 +650,9 @@ meta_window_x11_unmanage (MetaWindow *window) meta_display_ungrab_focus_window_button (window->display, window); meta_error_trap_pop (window->display); + + if (window->frame) + meta_window_destroy_frame (window); } static void |