AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

color scale: Improve themability

Browse Source 
Add the .color class, so themes can style scale.color.
Clip the trough rendering to the content path, so that
themes can set rounded corners.
This commit is contained in:
Matthias Clasen 2016-01-15 20:08:57 -05:00
parent a0d91a3a71
commit e7fc87e4ac
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcolorscale.c
View File

@ -27,6 +27,7 @@
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkrenderprivate.h"
#include <math.h> #include <math.h>
@ -216,6 +217,7 @@ scale_draw (GtkWidget *widget,
GtkColorScale *scale = GTK_COLOR_SCALE (widget); GtkColorScale *scale = GTK_COLOR_SCALE (widget);
gint width, height, x_offset, y_offset; gint width, height, x_offset, y_offset;
cairo_pattern_t *pattern; cairo_pattern_t *pattern;
GtkStyleContext *context;
create_surface (scale); create_surface (scale);
gtk_color_scale_get_trough_size (scale, gtk_color_scale_get_trough_size (scale,
@ -224,7 +226,9 @@ scale_draw (GtkWidget *widget,
cairo_save (cr); cairo_save (cr);
cairo_translate (cr, x_offset, y_offset); cairo_translate (cr, x_offset, y_offset);
cairo_rectangle (cr, 0, 0, width, height);
context = gtk_widget_get_style_context (widget);
gtk_render_content_path (context, cr, 0, 0, width, height);
pattern = cairo_pattern_create_for_surface (scale->priv->surface); pattern = cairo_pattern_create_for_surface (scale->priv->surface);
if (gtk_orientable_get_orientation (GTK_ORIENTABLE (widget)) == GTK_ORIENTATION_HORIZONTAL && if (gtk_orientable_get_orientation (GTK_ORIENTABLE (widget)) == GTK_ORIENTATION_HORIZONTAL &&
@ -251,6 +255,8 @@ scale_draw (GtkWidget *widget,
static void static void
gtk_color_scale_init (GtkColorScale *scale) gtk_color_scale_init (GtkColorScale *scale)
{ {
GtkStyleContext *context;
scale->priv = gtk_color_scale_get_instance_private (scale); scale->priv = gtk_color_scale_get_instance_private (scale);
gtk_widget_add_events (GTK_WIDGET (scale), GDK_TOUCH_MASK); gtk_widget_add_events (GTK_WIDGET (scale), GDK_TOUCH_MASK);
@ -260,6 +266,9 @@ gtk_color_scale_init (GtkColorScale *scale)
G_CALLBACK (hold_action), scale); G_CALLBACK (hold_action), scale);
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (scale->priv->long_press_gesture), gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (scale->priv->long_press_gesture),
GTK_PHASE_TARGET); GTK_PHASE_TARGET);
context = gtk_widget_get_style_context (GTK_WIDGET (scale));
gtk_style_context_add_class (context, "color");
} }
static void static void