diff options
| author | Victor Kareh <[email protected]> | 2019-05-21 15:09:36 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-06-16 18:12:44 +0200 |
| commit | 2c115a1b5d93dcc3bcf4930ac76dae2833b1e56b (patch) | |
| tree | 8571dc914a14dd490737b42d8fdacb43f8fffc5c /src/ui/theme.c | |
| parent | 687423bb3ed807ff1bd638e9dd71fb3a7045ebd1 (diff) | |
| download | marco-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/theme.c')
| -rw-r--r-- | src/ui/theme.c | 50 |
1 files changed, 13 insertions, 37 deletions
diff --git a/src/ui/theme.c b/src/ui/theme.c index d673134c..2a3dd038 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -5527,19 +5527,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; @@ -5572,30 +5572,6 @@ meta_theme_draw_frame_with_style (MetaTheme *theme, } 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, cairo_t *cr, |