summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-21 13:52:30 -0400
committerVictor Kareh <[email protected]>2019-06-05 10:49:37 -0400
commit22aca3fcb271f557a65d474bce4eb2a115dd09fb (patch)
treebc78896244bfaeeee8c478bef2129d34353f56ea /src
parentd60980f23f73159bf4e2558b2cd674380604eea0 (diff)
downloadmarco-22aca3fcb271f557a65d474bce4eb2a115dd09fb.tar.bz2
marco-22aca3fcb271f557a65d474bce4eb2a115dd09fb.tar.xz
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
Diffstat (limited to 'src')
-rw-r--r--src/core/frame.c4
-rw-r--r--src/ui/frames.c1
2 files changed, 4 insertions, 1 deletions
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 */