From 7bcd852276e8d7e941144760c836e9eefffb1107 Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Tue, 21 May 2019 15:09:36 -0400 Subject: 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 --- src/ui/theme.c | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) (limited to 'src/ui/theme.c') diff --git a/src/ui/theme.c b/src/ui/theme.c index 299f1cc2..0c595fe4 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -5525,19 +5525,19 @@ meta_theme_get_title_scale (MetaTheme *theme, } void -meta_theme_draw_frame_with_style (MetaTheme *theme, - GtkStyleContext *style_gtk, - cairo_t *cr, - MetaFrameType type, - MetaFrameFlags flags, - int client_width, - int client_height, - PangoLayout *title_layout, - int text_height, - const MetaButtonLayout *button_layout, - MetaButtonState button_states[META_BUTTON_TYPE_LAST], - GdkPixbuf *mini_icon, - GdkPixbuf *icon) +meta_theme_draw_frame (MetaTheme *theme, + GtkStyleContext *style_gtk, + cairo_t *cr, + MetaFrameType type, + MetaFrameFlags flags, + int client_width, + int client_height, + PangoLayout *title_layout, + int text_height, + const MetaButtonLayout *button_layout, + MetaButtonState button_states[META_BUTTON_TYPE_LAST], + GdkPixbuf *mini_icon, + GdkPixbuf *icon) { MetaFrameGeometry fgeom; MetaFrameStyle *style; @@ -5569,30 +5569,6 @@ meta_theme_draw_frame_with_style (MetaTheme *theme, mini_icon, icon); } -void -meta_theme_draw_frame (MetaTheme *theme, - GtkWidget *widget, - cairo_t *cr, - MetaFrameType type, - MetaFrameFlags flags, - int client_width, - int client_height, - PangoLayout *title_layout, - int text_height, - const MetaButtonLayout *button_layout, - MetaButtonState button_states[META_BUTTON_TYPE_LAST], - GdkPixbuf *mini_icon, - GdkPixbuf *icon) -{ - meta_theme_draw_frame_with_style (theme, - gtk_widget_get_style_context (widget), - cr, - type, flags, client_width, client_height, - title_layout, text_height, - button_layout, button_states, - mini_icon, icon); -} - void meta_theme_draw_frame_by_name (MetaTheme *theme, GtkWidget *widget, -- cgit v1.2.1