diff options
author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2016-03-14 19:02:03 -0300 |
---|---|---|
committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2016-03-14 19:02:03 -0300 |
commit | eafe354d66467aff6c88cde6512dddc65484e1c4 (patch) | |
tree | 1116404c7e71ec3da6c12f5747ad8f0cfcac5d4b /gladeui/glade-design-view.c | |
parent | c695cc5a963069ebad91f277624d0904104668fd (diff) | |
download | glade-eafe354d66467aff6c88cde6512dddc65484e1c4.tar.gz |
GladeDesignView: get color properly for context style to draw glade logo
Diffstat (limited to 'gladeui/glade-design-view.c')
-rw-r--r-- | gladeui/glade-design-view.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gladeui/glade-design-view.c b/gladeui/glade-design-view.c index 1b78d167..e22996e1 100644 --- a/gladeui/glade-design-view.c +++ b/gladeui/glade-design-view.c @@ -60,8 +60,6 @@ struct _GladeDesignViewPrivate GtkWidget *scrolled_window; /* Main scrolled window */ GtkWidget *layout_box; /* Box to pack a GladeDesignLayout for each toplevel in project */ - GdkRGBA fg_color; - _GladeDrag *drag_target; GObject *drag_data; gboolean drag_highlight; @@ -370,12 +368,16 @@ static gboolean glade_design_view_viewport_draw (GtkWidget *widget, cairo_t *cr, GladeDesignView *view) { GladeDesignViewPrivate *priv = GLADE_DESIGN_VIEW (view)->priv; + GtkStyleContext *context = gtk_widget_get_style_context (widget); + GdkRGBA fg_color; - logo_draw (widget, cr, &priv->fg_color); + gtk_style_context_get_color (context, gtk_style_context_get_state (context), + &fg_color); + + logo_draw (widget, cr, &fg_color); if (priv->drag_highlight) { - GtkStyleContext *context = gtk_widget_get_style_context (widget); GdkRGBA c; gtk_style_context_save (context); @@ -727,16 +729,6 @@ glade_design_view_drag_init (_GladeDragInterface *iface) } static void -glade_design_view_style_updated (GtkWidget *widget) -{ - GladeDesignViewPrivate *priv = GLADE_DESIGN_VIEW (widget)->priv; - - gtk_style_context_get_color (gtk_widget_get_style_context (widget), - GTK_STATE_FLAG_NORMAL, - &priv->fg_color); -} - -static void glade_design_view_class_init (GladeDesignViewClass *klass) { GObjectClass *object_class; @@ -754,7 +746,6 @@ glade_design_view_class_init (GladeDesignViewClass *klass) widget_class->drag_leave = glade_design_view_drag_leave; widget_class->drag_data_received = glade_design_view_drag_data_received; widget_class->drag_drop = glade_design_view_drag_drop; - widget_class->style_updated = glade_design_view_style_updated; g_object_class_install_property (object_class, PROP_PROJECT, |