frame: Delay updating the background until the frame is ready
To determine the correct background style, the UI needs to access some frame properties via meta_core_get(); this call will bail out early if window->frame is unset, so delay the call until the association is made. https://bugzilla.gnome.org/show_bug.cgi?id=645355
This commit is contained in:
parent
a2cb38b382
commit
37aeb5baf1
@ -117,11 +117,6 @@ meta_window_ensure_frame (MetaWindow *window)
|
|||||||
|
|
||||||
meta_display_register_x_window (window->display, &frame->xwindow, window);
|
meta_display_register_x_window (window->display, &frame->xwindow, window);
|
||||||
|
|
||||||
/* Now that frame->xwindow is registered with window, we can set its
|
|
||||||
* background.
|
|
||||||
*/
|
|
||||||
meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
|
|
||||||
|
|
||||||
/* Reparent the client window; it may be destroyed,
|
/* Reparent the client window; it may be destroyed,
|
||||||
* thus the error trap. We'll get a destroy notify later
|
* thus the error trap. We'll get a destroy notify later
|
||||||
* and free everything. Comment in FVWM source code says
|
* and free everything. Comment in FVWM source code says
|
||||||
@ -157,6 +152,11 @@ meta_window_ensure_frame (MetaWindow *window)
|
|||||||
|
|
||||||
/* stick frame to the window */
|
/* stick frame to the window */
|
||||||
window->frame = frame;
|
window->frame = frame;
|
||||||
|
|
||||||
|
/* Now that frame->xwindow is registered with window, we can set its
|
||||||
|
* background.
|
||||||
|
*/
|
||||||
|
meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
|
||||||
|
|
||||||
if (window->title)
|
if (window->title)
|
||||||
meta_ui_set_frame_title (window->screen->ui,
|
meta_ui_set_frame_title (window->screen->ui,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user