diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2012-12-16 17:31:00 -0500 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2015-01-07 13:54:31 +0200 |
| commit | 76aa07041ee56169d9c0af8fcdb36f841af111f2 (patch) | |
| tree | 925ea16a09ddd72e4da0265a33d20ebd6faa54d2 | |
| parent | 96d7a66261da2153224654a5531bbc0286c6967b (diff) | |
| download | metacity-76aa07041ee56169d9c0af8fcdb36f841af111f2.tar.gz | |
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
| -rw-r--r-- | src/ui/frames.c | 24 | ||||
| -rw-r--r-- | src/ui/preview-widget.c | 2 | ||||
| -rw-r--r-- | src/ui/theme-viewer.c | 2 | ||||
| -rw-r--r-- | src/ui/theme.c | 49 | ||||
| -rw-r--r-- | src/ui/theme.h | 16 |
5 files changed, 29 insertions, 64 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c index cb13c7fa..e814c35c 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -2533,17 +2533,19 @@ meta_frames_paint (MetaFrames *frames, meta_prefs_get_button_layout (&button_layout); - meta_theme_draw_frame_with_style (meta_theme_get_current (), - frame->style, - cr, - type, - flags, - w, h, - frame->layout, - frame->text_height, - &button_layout, - button_states, - mini_icon, icon); + meta_theme_draw_frame (meta_theme_get_current (), + frame->style, + cr, + type, + flags, + w, + h, + frame->layout, + frame->text_height, + &button_layout, + button_states, + mini_icon, + icon); } static void diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c index 85f489a3..39505e74 100644 --- a/src/ui/preview-widget.c +++ b/src/ui/preview-widget.c @@ -217,7 +217,7 @@ meta_preview_draw (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); meta_theme_draw_frame (preview->theme, - widget, + gtk_widget_get_style_context (widget), cr, preview->type, preview->flags, diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c index e3922d45..351362c6 100644 --- a/src/ui/theme-viewer.c +++ b/src/ui/theme-viewer.c @@ -1082,7 +1082,7 @@ run_theme_benchmark (void) cr = cairo_create (pixmap); meta_theme_draw_frame (global_theme, - widget, + gtk_widget_get_style_context (widget), cr, META_FRAME_TYPE_NORMAL, get_flags (widget), diff --git a/src/ui/theme.c b/src/ui/theme.c index 2f1e2fb7..8067b9aa 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -5375,19 +5375,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; @@ -5420,29 +5420,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_get_frame_borders (MetaTheme *theme, MetaFrameType type, int text_height, diff --git a/src/ui/theme.h b/src/ui/theme.h index 630c4e47..7645cdef 100644 --- a/src/ui/theme.h +++ b/src/ui/theme.h @@ -974,7 +974,7 @@ double meta_theme_get_title_scale (MetaTheme *theme, MetaFrameFlags flags); void meta_theme_draw_frame (MetaTheme *theme, - GtkWidget *widget, + GtkStyleContext *style_gtk, cairo_t *cr, MetaFrameType type, MetaFrameFlags flags, @@ -987,20 +987,6 @@ void meta_theme_draw_frame (MetaTheme *theme, GdkPixbuf *mini_icon, GdkPixbuf *icon); -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); - void meta_theme_get_frame_borders (MetaTheme *theme, MetaFrameType type, int text_height, |