summaryrefslogtreecommitdiff
path: root/src/ui/frames.c
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2019-05-21 15:09:36 -0400
committerraveit65 <[email protected]>2019-06-16 18:12:44 +0200
commit2c115a1b5d93dcc3bcf4930ac76dae2833b1e56b (patch)
tree8571dc914a14dd490737b42d8fdacb43f8fffc5c /src/ui/frames.c
parent687423bb3ed807ff1bd638e9dd71fb3a7045ebd1 (diff)
downloadmarco-2c115a1b5d93dcc3bcf4930ac76dae2833b1e56b.tar.bz2
marco-2c115a1b5d93dcc3bcf4930ac76dae2833b1e56b.tar.xz
theme: Make meta_frame_draw_theme take a GtkStyleContext instead of a widget
The style context of the widget is rarely what we want. We won't fix this to be a MetaFrames style context yet; this just changes the internal API. https://bugzilla.gnome.org/show_bug.cgi?id=690317 upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/76aa0704
Diffstat (limited to 'src/ui/frames.c')
-rw-r--r--src/ui/frames.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 6ce7e5c5..bab2f6d0 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -2544,17 +2544,19 @@ meta_frames_paint_to_drawable (MetaFrames *frames,
meta_prefs_get_button_layout (&button_layout);
scale = gdk_window_get_scale_factor (frame->window);
- meta_theme_draw_frame_with_style (meta_theme_get_current (),
+ meta_theme_draw_frame (meta_theme_get_current (),
frame->style,
cr,
type,
flags,
- w / scale, h / scale,
+ w / scale,
+ h / scale,
frame->layout,
frame->text_height,
&button_layout,
button_states,
- mini_icon, icon);
+ mini_icon,
+ icon);
}
static gboolean