callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swatch fixup

Browse Source
This commit is contained in:
Matthias Clasen
2015-10-30 21:43:50 -04:00
parent e5d3c8dbae
commit 5ec9b330b3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkcolorswatch.c
View File

@ -36,7 +36,7 @@
/* /*
* GtkColorSwatch has two CSS nodes, the main one named colorswatch * GtkColorSwatch has two CSS nodes, the main one named colorswatch
* and a subnode named image. The main node gets the .light or .dark * and a subnode named overlay. The main node gets the .light or .dark
* style classes added depending on the brightness of the color that * style classes added depending on the brightness of the color that
* the swatch is showing. * the swatch is showing.
*/ */
@ -55,7 +55,7 @@ struct _GtkColorSwatchPrivate
GtkGesture *long_press_gesture; GtkGesture *long_press_gesture;
GtkGesture *multipress_gesture; GtkGesture *multipress_gesture;
GtkCssNode *icon_node; GtkCssNode *overlay_node;
GtkWidget *popover; GtkWidget *popover;
}; };
@ -114,11 +114,11 @@ gtk_color_swatch_init (GtkColorSwatch *swatch)
G_CALLBACK (tap_action), swatch); G_CALLBACK (tap_action), swatch);
widget_node = gtk_widget_get_css_node (GTK_WIDGET (swatch)); widget_node = gtk_widget_get_css_node (GTK_WIDGET (swatch));
swatch->priv->icon_node = gtk_css_node_new (); swatch->priv->overlay_node = gtk_css_node_new ();
gtk_css_node_set_name (swatch->priv->icon_node, I_("image")); gtk_css_node_set_name (swatch->priv->overlay_node, I_("overlay"));
gtk_css_node_set_parent (swatch->priv->icon_node, widget_node); gtk_css_node_set_parent (swatch->priv->overlay_node, widget_node);
gtk_css_node_set_state (swatch->priv->icon_node, gtk_css_node_get_state (widget_node)); gtk_css_node_set_state (swatch->priv->overlay_node, gtk_css_node_get_state (widget_node));
g_object_unref (swatch->priv->icon_node); g_object_unref (swatch->priv->overlay_node);
} }
#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11) #define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11)
@ -218,7 +218,7 @@ swatch_draw (GtkWidget *widget,
rect.x = border.left + padding.left; rect.x = border.left + padding.left;
rect.y = border.top + padding.top; rect.y = border.top + padding.top;
gtk_style_context_save_to_node (context, swatch->priv->icon_node); gtk_style_context_save_to_node (context, swatch->priv->overlay_node);
gtk_render_background (context, cr, rect.x, rect.y, rect.width, rect.height); gtk_render_background (context, cr, rect.x, rect.y, rect.width, rect.height);
gtk_render_frame (context, cr, rect.x, rect.y, rect.width, rect.height); gtk_render_frame (context, cr, rect.x, rect.y, rect.width, rect.height);
@ -608,7 +608,7 @@ swatch_state_flags_changed (GtkWidget *widget,
{ {
GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget); GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
gtk_css_node_set_state (swatch->priv->icon_node, gtk_widget_get_state_flags (widget)); gtk_css_node_set_state (swatch->priv->overlay_node, gtk_widget_get_state_flags (widget));
} }
/* GObject implementation {{{1 */ /* GObject implementation {{{1 */