From 22aca3fcb271f557a65d474bce4eb2a115dd09fb Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Tue, 21 May 2019 13:52:30 -0400 Subject: ui-frames: Delay attaching the style to new frames Like the setting of new frames' background is delayed until the frame is associated with its window, delay attaching the initial style, so that the correct style variant is picked. https://bugzilla.gnome.org/show_bug.cgi?id=645355 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/ee056853 --- src/core/frame.c | 4 ++++ src/ui/frames.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/frame.c b/src/core/frame.c index f2405922..070fee79 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -146,6 +146,10 @@ meta_window_ensure_frame (MetaWindow *window) /* stick frame to the window */ window->frame = frame; + /* Now that frame->xwindow is registered with window, we can set its + * style. + */ + meta_ui_update_frame_style (window->screen->ui, frame->xwindow); if (window->title) meta_ui_set_frame_title (window->screen->ui, window->frame->xwindow, diff --git a/src/ui/frames.c b/src/ui/frames.c index 9f1ee8cb..02613210 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -579,7 +579,6 @@ meta_frames_manage_window (MetaFrames *frames, gdk_window_set_user_data (frame->window, frames); frame->style = NULL; - meta_frames_attach_style (frames, frame); /* Don't set event mask here, it's in frame.c */ -- cgit v1.2.1