summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-21 13:52:30 -0400
committerraveit65 <[email protected]>2019-06-16 18:12:44 +0200
commita792e124e543397e5c4d96c8bebb2e2f4b3a6721 (patch)
treef0a45d01ed00ae12b5a8b60232bec2653c34cd38
parentbaefb5339608bbc0ee087e6f11e11dd5f4aa7d33 (diff)
downloadmarco-a792e124e543397e5c4d96c8bebb2e2f4b3a6721.tar.bz2
marco-a792e124e543397e5c4d96c8bebb2e2f4b3a6721.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
-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 065baf8e..74742e79 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 */