[gtk+/wip/cosimoc/range-gadget] WIP
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/cosimoc/range-gadget] WIP
- Date: Sun, 10 Jan 2016 19:33:39 +0000 (UTC)
commit 439106ef63723dc025d35b14c09cb74f93420bee
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sat Jan 9 14:00:09 2016 -0800
WIP
gtk/gtkrange.c | 759 ++++++++++++++---------------
gtk/theme/Adwaita/_common.scss | 18 +
gtk/theme/Adwaita/gtk-contained-dark.css | 8 +
gtk/theme/Adwaita/gtk-contained.css | 8 +
4 files changed, 400 insertions(+), 393 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index e177ac7..4650454 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -32,6 +32,8 @@
#include "gtkrangeprivate.h"
#include "gtkadjustmentprivate.h"
+#include "gtkbuiltiniconprivate.h"
+#include "gtkcsscustomgadgetprivate.h"
#include "gtkcolorscaleprivate.h"
#include "gtkintl.h"
#include "gtkgesturelongpressprivate.h"
@@ -104,14 +106,14 @@ struct _GtkRangePrivate
GdkRectangle slider;
GdkWindow *event_window;
- GtkCssNode *stepper_a_node;
- GtkCssNode *stepper_b_node;
- GtkCssNode *stepper_c_node;
- GtkCssNode *stepper_d_node;
- GtkCssNode *trough_node;
- GtkCssNode *highlight_node;
- GtkCssNode *fill_node;
- GtkCssNode *slider_node;
+ GtkCssGadget *stepper_a_gadget;
+ GtkCssGadget *stepper_b_gadget;
+ GtkCssGadget *stepper_c_gadget;
+ GtkCssGadget *stepper_d_gadget;
+ GtkCssGadget *trough_gadget;
+ GtkCssGadget *fill_gadget;
+ GtkCssGadget *highlight_gadget;
+ GtkCssGadget *slider_gadget;
GtkOrientation orientation;
@@ -730,17 +732,6 @@ gtk_range_get_property (GObject *object,
}
static void
-node_style_changed_cb (GtkCssNode *node,
- GtkCssStyleChange *change,
- GtkWidget *widget)
-{
- if (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_CLIP))
- gtk_widget_queue_resize (widget);
- else
- gtk_widget_queue_draw (widget);
-}
-
-static void
gtk_range_init (GtkRange *range)
{
GtkRangePrivate *priv;
@@ -778,19 +769,20 @@ gtk_range_init (GtkRange *range)
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (range));
widget_node = gtk_widget_get_css_node (GTK_WIDGET (range));
- priv->trough_node = gtk_css_node_new ();
- gtk_css_node_set_name (priv->trough_node, I_("trough"));
- gtk_css_node_set_parent (priv->trough_node, widget_node);
- gtk_css_node_set_state (priv->trough_node, gtk_css_node_get_state (widget_node));
- g_signal_connect_object (priv->trough_node, "style-changed", G_CALLBACK (node_style_changed_cb), range, 0);
- g_object_unref (priv->trough_node);
-
- priv->slider_node = gtk_css_node_new ();
- gtk_css_node_set_name (priv->slider_node, I_("slider"));
- gtk_css_node_set_parent (priv->slider_node, priv->trough_node);
- gtk_css_node_set_state (priv->slider_node, gtk_css_node_get_state (widget_node));
- g_signal_connect_object (priv->slider_node, "style-changed", G_CALLBACK (node_style_changed_cb), range, 0);
- g_object_unref (priv->slider_node);
+ priv->trough_gadget = gtk_css_custom_gadget_new ("trough",
+ GTK_WIDGET (range),
+ NULL, NULL,
+ NULL, NULL, NULL,
+ NULL, NULL);
+ gtk_css_node_set_parent (gtk_css_gadget_get_node (priv->trough_gadget), widget_node);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->trough_gadget),
+ gtk_css_node_get_state (widget_node));
+
+ priv->slider_gadget = gtk_builtin_icon_new ("slider",
+ GTK_WIDGET (range),
+ priv->trough_gadget, NULL);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->slider_gadget),
+ gtk_css_node_get_state (widget_node));
/* Note: Order is important here.
* The ::drag-begin handler relies on the state set up by the
@@ -904,9 +896,9 @@ gtk_range_set_adjustment (GtkRange *range,
}
static void
-update_stepper_state (GtkRange *range,
- Stepper stepper,
- GtkCssNode *node)
+update_stepper_state (GtkRange *range,
+ Stepper stepper,
+ GtkCssGadget *gadget)
{
GtkRangePrivate *priv = range->priv;
GtkStateFlags state;
@@ -936,7 +928,7 @@ update_stepper_state (GtkRange *range,
state |= GTK_STATE_FLAG_PRELIGHT;
}
- gtk_css_node_set_state (node, state);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (gadget), state);
}
static void
@@ -945,13 +937,13 @@ update_steppers_state (GtkRange *range)
GtkRangePrivate *priv = range->priv;
if (priv->has_stepper_a)
- update_stepper_state (range, STEPPER_A, priv->stepper_a_node);
+ update_stepper_state (range, STEPPER_A, priv->stepper_a_gadget);
if (priv->has_stepper_b)
- update_stepper_state (range, STEPPER_B, priv->stepper_b_node);
+ update_stepper_state (range, STEPPER_B, priv->stepper_b_gadget);
if (priv->has_stepper_c)
- update_stepper_state (range, STEPPER_C, priv->stepper_c_node);
+ update_stepper_state (range, STEPPER_C, priv->stepper_c_gadget);
if (priv->has_stepper_d)
- update_stepper_state (range, STEPPER_D, priv->stepper_d_node);
+ update_stepper_state (range, STEPPER_D, priv->stepper_d_gadget);
}
/**
@@ -1031,7 +1023,7 @@ gtk_range_set_flippable (GtkRange *range,
{
priv->flippable = flippable;
- gtk_widget_queue_draw (GTK_WIDGET (range));
+ gtk_widget_queue_allocate (GTK_WIDGET (range));
}
}
@@ -1467,21 +1459,21 @@ gtk_range_set_show_fill_level (GtkRange *range,
if (show_fill_level)
{
- priv->fill_node = gtk_css_node_new ();
- gtk_css_node_set_name (priv->fill_node, I_("fill"));
- gtk_css_node_set_parent (priv->fill_node, priv->trough_node);
- gtk_css_node_set_state (priv->fill_node, gtk_css_node_get_state (priv->trough_node));
- g_signal_connect_object (priv->fill_node, "style-changed", G_CALLBACK (node_style_changed_cb), range,
0);
- g_object_unref (priv->fill_node);
+ priv->fill_gadget = gtk_css_custom_gadget_new ("fill",
+ GTK_WIDGET (range),
+ priv->trough_gadget, NULL,
+ NULL, NULL, NULL,
+ NULL, NULL);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->fill_gadget),
+ gtk_css_node_get_state (gtk_css_gadget_get_node (priv->trough_gadget)));
}
else
{
- gtk_css_node_set_parent (priv->fill_node, NULL);
- priv->fill_node = NULL;
+ g_clear_object (&priv->fill_gadget);
}
g_object_notify_by_pspec (G_OBJECT (range), properties[PROP_SHOW_FILL_LEVEL]);
- gtk_widget_queue_draw (GTK_WIDGET (range));
+ gtk_widget_queue_allocate (GTK_WIDGET (range));
}
/**
@@ -1593,7 +1585,7 @@ gtk_range_set_fill_level (GtkRange *range,
g_object_notify_by_pspec (G_OBJECT (range), properties[PROP_FILL_LEVEL]);
if (priv->show_fill_level)
- gtk_widget_queue_draw (GTK_WIDGET (range));
+ gtk_widget_queue_allocate (GTK_WIDGET (range));
if (priv->restrict_to_fill_level)
gtk_range_set_value (range, gtk_range_get_value (range));
@@ -1644,6 +1636,11 @@ gtk_range_destroy (GtkWidget *widget)
g_clear_object (&priv->multipress_gesture);
g_clear_object (&priv->long_press_gesture);
+ g_clear_object (&priv->trough_gadget);
+ g_clear_object (&priv->fill_gadget);
+ g_clear_object (&priv->highlight_gadget);
+ g_clear_object (&priv->slider_gadget);
+
if (priv->adjustment)
{
g_signal_handlers_disconnect_by_func (priv->adjustment,
@@ -1719,23 +1716,247 @@ gtk_range_get_preferred_height (GtkWidget *widget,
}
static void
+gtk_range_allocate_trough (GtkRange *range,
+ GtkAllocation *out_clip)
+{
+ GtkRangePrivate *priv = range->priv;
+ GtkWidget *widget = GTK_WIDGET (range);
+ GtkAllocation widget_alloc;
+ GtkAllocation trough_alloc = priv->range_rect;
+ gboolean trough_under_steppers;
+ gint stepper_size;
+ gint stepper_spacing;
+
+ gtk_widget_style_get (widget,
+ "trough-under-steppers", &trough_under_steppers,
+ "stepper-size", &stepper_size,
+ "stepper-spacing", &stepper_spacing,
+ NULL);
+
+ gtk_widget_get_allocation (widget, &widget_alloc);
+ trough_alloc.x += widget_alloc.x;
+ trough_alloc.y += widget_alloc.y;
+
+ if (!trough_under_steppers)
+ {
+ gint offset = 0;
+ gint shorter = 0;
+
+ if (priv->has_stepper_a)
+ offset += stepper_size;
+
+ if (priv->has_stepper_b)
+ offset += stepper_size;
+
+ shorter += offset;
+
+ if (priv->has_stepper_c)
+ shorter += stepper_size;
+
+ if (priv->has_stepper_d)
+ shorter += stepper_size;
+
+ if (priv->has_stepper_a || priv->has_stepper_b)
+ {
+ offset += stepper_spacing;
+ shorter += stepper_spacing;
+ }
+
+ if (priv->has_stepper_c || priv->has_stepper_d)
+ {
+ shorter += stepper_spacing;
+ }
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ trough_alloc.x += offset;
+ trough_alloc.width -= shorter;
+ }
+ else
+ {
+ trough_alloc.y += offset;
+ trough_alloc.height -= shorter;
+ }
+ }
+
+ gtk_css_gadget_allocate (priv->trough_gadget,
+ &trough_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ out_clip);
+
+ if (priv->show_fill_level &&
+ gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) != 0)
+ {
+ gdouble level;
+ gdouble fill = 0.0;
+ GtkAllocation content_alloc, fill_alloc, fill_clip;
+
+ gtk_css_gadget_get_content_allocation (priv->trough_gadget,
+ &content_alloc, NULL);
+ fill_alloc = content_alloc;
+
+ level = CLAMP (priv->fill_level,
+ gtk_adjustment_get_lower (priv->adjustment),
+ gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment));
+
+ fill = (level - gtk_adjustment_get_lower (priv->adjustment)) /
+ (gtk_adjustment_get_upper (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) -
+ gtk_adjustment_get_page_size (priv->adjustment));
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ fill_alloc.width *= fill;
+
+ if (should_invert (range))
+ fill_alloc.x += content_alloc.width - fill_alloc.width;
+ }
+ else
+ {
+ fill_alloc.height *= fill;
+
+ if (should_invert (range))
+ fill_alloc.y += content_alloc.height - (fill_alloc.height * fill);
+ }
+
+ gtk_css_gadget_allocate (priv->fill_gadget,
+ &fill_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &fill_clip);
+ gdk_rectangle_union (out_clip, &fill_clip, out_clip);
+ }
+
+ if (priv->has_origin)
+ {
+ GtkAllocation content_alloc, highlight_alloc, highlight_clip, slider_alloc;
+
+ gtk_css_gadget_get_content_allocation (priv->trough_gadget,
+ &content_alloc, NULL);
+ gtk_css_gadget_get_content_allocation (priv->slider_gadget,
+ &slider_alloc, NULL);
+ highlight_alloc = content_alloc;
+
+ if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+ {
+ if (!should_invert (range))
+ {
+ highlight_alloc.x = content_alloc.x;
+ highlight_alloc.width = slider_alloc.x + slider_alloc.width / 2 - content_alloc.x;
+ }
+ else
+ {
+ highlight_alloc.x = slider_alloc.x + slider_alloc.width / 2;
+ highlight_alloc.width = content_alloc.x + content_alloc.width - highlight_alloc.x;
+ }
+ }
+ else
+ {
+ if (!should_invert (range))
+ {
+ highlight_alloc.y = content_alloc.y;
+ highlight_alloc.height = slider_alloc.y + slider_alloc.height / 2 - content_alloc.y;
+ }
+ else
+ {
+ highlight_alloc.y = slider_alloc.y + slider_alloc.height / 2;
+ highlight_alloc.height = content_alloc.y + content_alloc.height - highlight_alloc.y;
+ }
+ }
+
+ gtk_css_gadget_allocate (priv->highlight_gadget,
+ &highlight_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &highlight_clip);
+ gdk_rectangle_union (out_clip, &highlight_clip, out_clip);
+ }
+}
+
+static void
gtk_range_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkRange *range = GTK_RANGE (widget);
GtkRangePrivate *priv = range->priv;
+ GtkAllocation clip, trough_clip, slider_clip, stepper_clip;
+ GtkAllocation slider_alloc, stepper_alloc;
gtk_widget_set_allocation (widget, allocation);
- gtk_range_calc_marks (range);
- gtk_range_calc_layout (range);
-
if (gtk_widget_get_realized (widget))
gdk_window_move_resize (priv->event_window,
allocation->x, allocation->y,
allocation->width, allocation->height);
- _gtk_widget_set_simple_clip (widget, NULL);
+ gtk_range_calc_marks (range);
+ gtk_range_calc_layout (range);
+
+ slider_alloc = priv->slider;
+ slider_alloc.x += allocation->x;
+ slider_alloc.y += allocation->y;
+
+ gtk_css_gadget_allocate (priv->slider_gadget,
+ &slider_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &slider_clip);
+
+ gtk_range_allocate_trough (range, &trough_clip);
+ gdk_rectangle_union (&trough_clip, &slider_clip, &clip);
+
+ if (priv->stepper_a_gadget)
+ {
+ stepper_alloc = priv->stepper_a;
+ stepper_alloc.x += allocation->x;
+ stepper_alloc.y += allocation->y;
+
+ gtk_css_gadget_allocate (priv->stepper_a_gadget,
+ &stepper_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &stepper_clip);
+ gdk_rectangle_union (&clip, &stepper_clip, &clip);
+ }
+
+ if (priv->stepper_b_gadget)
+ {
+ stepper_alloc = priv->stepper_b;
+ stepper_alloc.x += allocation->x;
+ stepper_alloc.y += allocation->y;
+
+ gtk_css_gadget_allocate (priv->stepper_b_gadget,
+ &stepper_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &stepper_clip);
+ gdk_rectangle_union (&clip, &stepper_clip, &clip);
+ }
+
+ if (priv->stepper_c_gadget)
+ {
+ stepper_alloc = priv->stepper_c;
+ stepper_alloc.x += allocation->x;
+ stepper_alloc.y += allocation->y;
+
+ gtk_css_gadget_allocate (priv->stepper_c_gadget,
+ &stepper_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &stepper_clip);
+ gdk_rectangle_union (&clip, &stepper_clip, &clip);
+ }
+
+ if (priv->stepper_d_gadget)
+ {
+ stepper_alloc = priv->stepper_d;
+ stepper_alloc.x += allocation->x;
+ stepper_alloc.y += allocation->y;
+
+ gtk_css_gadget_allocate (priv->stepper_d_gadget,
+ &stepper_alloc,
+ gtk_widget_get_allocated_baseline (widget),
+ &stepper_clip);
+ gdk_rectangle_union (&clip, &stepper_clip, &clip);
+ }
+
+ gtk_widget_set_clip (widget, &clip);
}
static void
@@ -1835,7 +2056,7 @@ update_slider_state (GtkRange *range)
if (priv->grab_location == MOUSE_SLIDER)
state |= GTK_STATE_FLAG_ACTIVE;
- gtk_css_node_set_state (priv->slider_node, state);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->slider_gadget), state);
}
static void
@@ -1854,11 +2075,11 @@ update_trough_state (GtkRange *range)
if (priv->grab_location == MOUSE_TROUGH)
state |= GTK_STATE_FLAG_ACTIVE;
- gtk_css_node_set_state (priv->trough_node, state);
- if (priv->highlight_node)
- gtk_css_node_set_state (priv->highlight_node, state);
- if (priv->fill_node)
- gtk_css_node_set_state (priv->fill_node, state);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->trough_gadget), state);
+ if (priv->highlight_gadget)
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->highlight_gadget), state);
+ if (priv->fill_gadget)
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->fill_gadget), state);
}
static void
@@ -1874,61 +2095,6 @@ gtk_range_state_flags_changed (GtkWidget *widget,
GTK_WIDGET_CLASS (gtk_range_parent_class)->state_flags_changed (widget, previous_state);
}
-static void
-draw_stepper (GtkRange *range,
- cairo_t *cr,
- GdkRectangle *rect,
- GtkCssNode *node,
- GtkArrowType arrow_type)
-{
- GtkStyleContext *context;
- GtkWidget *widget = GTK_WIDGET (range);
- gfloat arrow_scaling;
- gdouble arrow_x;
- gdouble arrow_y;
- gdouble arrow_size, angle;
-
- context = gtk_widget_get_style_context (widget);
- gtk_style_context_save_to_node (context, node);
-
- 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_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
-
- arrow_size = MIN (rect->width, rect->height) * arrow_scaling;
- arrow_x = rect->x + (rect->width - arrow_size) / 2;
- arrow_y = rect->y + (rect->height - arrow_size) / 2;
-
- switch (arrow_type)
- {
- case GTK_ARROW_RIGHT:
- angle = G_PI / 2;
- break;
- case GTK_ARROW_DOWN:
- angle = G_PI;
- break;
- case GTK_ARROW_LEFT:
- angle = 3 * (G_PI / 2);
- break;
- case GTK_ARROW_UP:
- default:
- angle = 0;
- break;
- }
-
- gtk_render_arrow (context, cr,
- angle,
- arrow_x, arrow_y,
- arrow_size);
-
- gtk_style_context_restore (context);
-}
-
static gboolean
gtk_range_draw (GtkWidget *widget,
cairo_t *cr)
@@ -1938,7 +2104,6 @@ gtk_range_draw (GtkWidget *widget,
gboolean draw_trough = TRUE;
gboolean draw_slider = TRUE;
GtkStyleContext *context;
- GtkBorder margin;
context = gtk_widget_get_style_context (widget);
@@ -1954,243 +2119,41 @@ gtk_range_draw (GtkWidget *widget,
draw_slider = TRUE;
}
- /* Just to be confusing, we draw the trough for the whole
- * range rectangle, not the trough rectangle (the trough
- * rectangle is just for hit detection)
- */
- cairo_save (cr);
- gdk_cairo_rectangle (cr, &priv->range_rect);
- cairo_clip (cr);
-
+ if (draw_trough)
{
- gint x = priv->range_rect.x;
- gint y = priv->range_rect.y;
- gint width = priv->range_rect.width;
- gint height = priv->range_rect.height;
- gboolean trough_under_steppers;
- gint stepper_size;
- gint stepper_spacing;
-
- gtk_widget_style_get (GTK_WIDGET (range),
- "trough-under-steppers", &trough_under_steppers,
- "stepper-size", &stepper_size,
- "stepper-spacing", &stepper_spacing,
- NULL);
-
- if (!trough_under_steppers)
- {
- gint offset = 0;
- gint shorter = 0;
-
- if (priv->has_stepper_a)
- offset += stepper_size;
-
- if (priv->has_stepper_b)
- offset += stepper_size;
-
- shorter += offset;
-
- if (priv->has_stepper_c)
- shorter += stepper_size;
-
- if (priv->has_stepper_d)
- shorter += stepper_size;
-
- if (priv->has_stepper_a || priv->has_stepper_b)
- {
- offset += stepper_spacing;
- shorter += stepper_spacing;
- }
-
- if (priv->has_stepper_c || priv->has_stepper_d)
- {
- shorter += stepper_spacing;
- }
-
- if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- x += offset;
- width -= shorter;
- }
- else
- {
- y += offset;
- height -= shorter;
- }
- }
-
- if (draw_trough)
- {
- gtk_style_context_save_to_node (context, priv->trough_node);
+ gtk_css_gadget_draw (priv->trough_gadget, cr);
- gtk_style_context_get_margin (context, gtk_style_context_get_state (context), &margin);
+ if (priv->show_fill_level &&
+ gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) -
+ gtk_adjustment_get_lower (priv->adjustment) != 0)
+ gtk_css_gadget_draw (priv->fill_gadget, cr);
- x += margin.left;
- y += margin.top;
- width -= margin.left + margin.right;
- height -= margin.top + margin.bottom;
-
- gtk_render_background (context, cr, x, y, width, height);
- gtk_render_frame (context, cr, x, y, width, height);
-
- gtk_style_context_restore (context);
-
- if (priv->show_fill_level &&
- gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment) -
- gtk_adjustment_get_lower (priv->adjustment) != 0)
- {
- gdouble level;
- gdouble fill = 0.0;
- gint fx = x;
- gint fy = y;
- gint fwidth = width;
- gint fheight = height;
-
- level = CLAMP (priv->fill_level,
- gtk_adjustment_get_lower (priv->adjustment),
- gtk_adjustment_get_upper (priv->adjustment) -
- gtk_adjustment_get_page_size (priv->adjustment));
-
- fill = (level - gtk_adjustment_get_lower (priv->adjustment)) /
- (gtk_adjustment_get_upper (priv->adjustment) -
- gtk_adjustment_get_lower (priv->adjustment) -
- gtk_adjustment_get_page_size (priv->adjustment));
-
- if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- if (!should_invert (range))
- {
- fx = x;
- fwidth = width * fill;
- }
- else
- {
- fwidth = width * fill;
- fx = x + width - fwidth;
- }
- }
- else
- {
- if (!should_invert (range))
- {
- fy = y;
- fheight = height * fill;
- }
- else
- {
- fheight = height * fill;
- fy = y + height - fheight;
- }
- }
-
- gtk_style_context_save_to_node (context, priv->fill_node);
-
- gtk_render_background (context, cr, fx, fy, fwidth, fheight);
- gtk_render_frame (context, cr, fx, fy, fwidth, fheight);
-
- gtk_style_context_restore (context);
- }
-
- if (priv->has_origin)
- {
- gint fx = x;
- gint fy = y;
- gint fwidth = width;
- gint fheight = height;
-
- if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- if (!should_invert (range))
- {
- fx = x;
- fwidth = priv->slider.x + priv->slider.width / 2 - x;
- }
- else
- {
- fx = priv->slider.x + priv->slider.width / 2;
- fwidth = x + width - fx;
- }
- }
- else
- {
- if (!should_invert (range))
- {
- fy = y;
- fheight = priv->slider.y + priv->slider.height / 2 - y;
- }
- else
- {
- fy = priv->slider.y + priv->slider.height / 2;
- fheight = y + height - fy;
- }
- }
-
- gtk_style_context_save_to_node (context, priv->highlight_node);
-
- gtk_render_background (context, cr, fx, fy, fwidth, fheight);
- gtk_render_frame (context, cr, fx, fy, fwidth, fheight);
-
- gtk_style_context_restore (context);
- }
- }
-
- if (!(gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE) &&
- gtk_widget_has_visible_focus (widget))
- {
- gtk_render_focus (context, cr,
- priv->range_rect.x,
- priv->range_rect.y,
- priv->range_rect.width,
- priv->range_rect.height);
- }
+ if (priv->has_origin)
+ gtk_css_gadget_draw (priv->highlight_gadget, cr);
}
- cairo_restore (cr);
+ if (!(gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE) &&
+ gtk_widget_has_visible_focus (widget))
+ gtk_render_focus (context, cr,
+ priv->range_rect.x,
+ priv->range_rect.y,
+ priv->range_rect.width,
+ priv->range_rect.height);
if (draw_slider)
- {
- cairo_save (cr);
- gdk_cairo_rectangle (cr, &priv->slider);
- cairo_clip (cr);
-
- gtk_style_context_save_to_node (context, priv->slider_node);
- gtk_style_context_get_margin (context, gtk_style_context_get_state (context), &margin);
-
- gtk_render_slider (context, cr,
- priv->slider.x + margin.left,
- priv->slider.y + margin.top,
- priv->slider.width - margin.left - margin.right,
- priv->slider.height - margin.top - margin.bottom,
- priv->orientation);
-
- gtk_style_context_restore (context);
-
- cairo_restore (cr);
- }
+ gtk_css_gadget_draw (priv->slider_gadget, cr);
if (priv->has_stepper_a)
- draw_stepper (range, cr,
- &priv->stepper_a,
- priv->stepper_a_node,
- priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT);
+ gtk_css_gadget_draw (priv->stepper_a_gadget, cr);
if (priv->has_stepper_b)
- draw_stepper (range, cr,
- &priv->stepper_b,
- priv->stepper_b_node,
- priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);
+ gtk_css_gadget_draw (priv->stepper_b_gadget, cr);
if (priv->has_stepper_c)
- draw_stepper (range, cr,
- &priv->stepper_c,
- priv->stepper_c_node,
- priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_UP : GTK_ARROW_LEFT);
+ gtk_css_gadget_draw (priv->stepper_c_gadget, cr);
if (priv->has_stepper_d)
- draw_stepper (range, cr,
- &priv->stepper_d,
- priv->stepper_d_node,
- priv->orientation == GTK_ORIENTATION_VERTICAL ? GTK_ARROW_DOWN : GTK_ARROW_RIGHT);
+ gtk_css_gadget_draw (priv->stepper_d_gadget, cr);
return GDK_EVENT_PROPAGATE;
}
@@ -3640,10 +3603,10 @@ gtk_range_calc_slider (GtkRange *range)
&new_slider);
if (gdk_rectangle_equal (&priv->slider, &new_slider) &&
- visible == gtk_css_node_get_visible (priv->slider_node))
+ visible == gtk_css_gadget_get_visible (priv->slider_gadget))
return;
- gtk_css_node_set_visible (priv->slider_node, visible);
+ gtk_css_gadget_set_visible (priv->slider_gadget, visible);
gtk_range_queue_draw_location (range, MOUSE_SLIDER);
@@ -4000,12 +3963,14 @@ gtk_range_queue_draw_location (GtkRange *range,
if (rect->width <= 0 || rect->height <= 0)
return;
- gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_queue_draw_area (widget,
- allocation.x + rect->x,
- allocation.y + rect->y,
- rect->width,
- rect->height);
+ gtk_widget_queue_allocate (widget);
+
+ /* gtk_widget_get_allocation (widget, &allocation); */
+ /* gtk_widget_queue_draw_area (widget, */
+ /* allocation.x + rect->x, */
+ /* allocation.y + rect->y, */
+ /* rect->width, */
+ /* rect->height); */
}
static void
@@ -4140,17 +4105,17 @@ _gtk_range_set_has_origin (GtkRange *range,
if (has_origin)
{
- priv->highlight_node = gtk_css_node_new ();
- gtk_css_node_set_name (priv->highlight_node, I_("highlight"));
- gtk_css_node_set_parent (priv->highlight_node, priv->trough_node);
- gtk_css_node_set_state (priv->highlight_node, gtk_css_node_get_state (priv->trough_node));
- g_signal_connect_object (priv->highlight_node, "style-changed", G_CALLBACK (node_style_changed_cb),
range, 0);
- g_object_unref (priv->highlight_node);
+ priv->highlight_gadget = gtk_css_custom_gadget_new ("highlight",
+ GTK_WIDGET (range),
+ priv->trough_gadget, NULL,
+ NULL, NULL, NULL,
+ NULL, NULL);
+ gtk_css_node_set_state (gtk_css_gadget_get_node (priv->highlight_gadget),
+ gtk_css_node_get_state (gtk_css_gadget_get_node (priv->trough_gadget)));
}
else
{
- gtk_css_node_set_parent (priv->highlight_node, NULL);
- priv->highlight_node = NULL;
+ g_clear_object (&priv->highlight_gadget);
}
}
@@ -4239,27 +4204,31 @@ gtk_range_get_round_digits (GtkRange *range)
return range->priv->round_digits;
}
-static GtkCssNode *
-create_stepper_node (GtkRange *range,
- const gchar *class,
- GtkCssNode *before,
- GtkCssNode *after)
+static GtkCssGadget *
+create_stepper_gadget (GtkRange *range,
+ const gchar *class,
+ GtkCssImageBuiltinType image_type,
+ GtkCssGadget *before,
+ GtkCssGadget *after)
{
+ GtkCssGadget *gadget;
GtkCssNode *widget_node, *node;
+ gadget = gtk_builtin_icon_new ("button",
+ GTK_WIDGET (range),
+ NULL, NULL);
+ gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (gadget), image_type);
+ gtk_css_gadget_add_class (gadget, class);
+
+ node = gtk_css_gadget_get_node (gadget);
widget_node = gtk_widget_get_css_node (GTK_WIDGET (range));
- node = gtk_css_node_new ();
- gtk_css_node_set_name (node, I_("button"));
- gtk_css_node_add_class (node, g_quark_from_static_string (class));
if (before)
- gtk_css_node_insert_before (widget_node, node, before);
+ gtk_css_node_insert_before (widget_node, node, gtk_css_gadget_get_node (before));
else
- gtk_css_node_insert_after (widget_node, node, after);
+ gtk_css_node_insert_after (widget_node, node, gtk_css_gadget_get_node (after));
gtk_css_node_set_state (node, gtk_css_node_get_state (widget_node));
- g_signal_connect_object (node, "style-changed", G_CALLBACK (node_style_changed_cb), range, 0);
- g_object_unref (node);
- return node;
+ return gadget;
}
void
@@ -4276,15 +4245,16 @@ _gtk_range_set_steppers (GtkRange *range,
priv->has_stepper_a = has_a;
if (has_a)
{
- priv->stepper_a_node = create_stepper_node (range,
- "down",
- priv->has_stepper_b ? priv->stepper_b_node :
priv->trough_node,
- NULL);
+ priv->stepper_a_gadget = create_stepper_gadget (range,
+ "down",
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_CSS_IMAGE_BUILTIN_ARROW_UP :
GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
+ priv->has_stepper_b ? priv->stepper_b_gadget :
priv->trough_gadget,
+ NULL);
}
else
{
- gtk_css_node_set_parent (priv->stepper_a_node, NULL);
- priv->stepper_a_node = NULL;
+ g_clear_object (&priv->stepper_a_gadget);
}
}
@@ -4293,15 +4263,16 @@ _gtk_range_set_steppers (GtkRange *range,
priv->has_stepper_b = has_b;
if (has_b)
{
- priv->stepper_b_node = create_stepper_node (range,
- "up",
- priv->trough_node,
- NULL);
+ priv->stepper_b_gadget = create_stepper_gadget (range,
+ "up",
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN :
GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
+ priv->trough_gadget,
+ NULL);
}
else
{
- gtk_css_node_set_parent (priv->stepper_b_node, NULL);
- priv->stepper_b_node = NULL;
+ g_clear_object (&priv->stepper_b_gadget);
}
}
@@ -4310,15 +4281,16 @@ _gtk_range_set_steppers (GtkRange *range,
priv->has_stepper_c = has_c;
if (has_c)
{
- priv->stepper_c_node = create_stepper_node (range,
- "down",
- NULL,
- priv->trough_node);
+ priv->stepper_c_gadget = create_stepper_gadget (range,
+ "down",
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_CSS_IMAGE_BUILTIN_ARROW_UP :
GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
+ NULL,
+ priv->trough_gadget);
}
else
{
- gtk_css_node_set_parent (priv->stepper_c_node, NULL);
- priv->stepper_c_node = NULL;
+ g_clear_object (&priv->stepper_c_gadget);
}
}
@@ -4327,15 +4299,16 @@ _gtk_range_set_steppers (GtkRange *range,
priv->has_stepper_d = has_d;
if (has_d)
{
- priv->stepper_d_node = create_stepper_node (range,
- "up",
- NULL,
- priv->has_stepper_c ? priv->stepper_c_node :
priv->trough_node);
+ priv->stepper_d_gadget = create_stepper_gadget (range,
+ "down",
+ priv->orientation == GTK_ORIENTATION_VERTICAL ?
+ GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN :
GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
+ NULL,
+ priv->has_stepper_c ? priv->stepper_c_gadget :
priv->trough_gadget);
}
else
{
- gtk_css_node_set_parent (priv->stepper_d_node, NULL);
- priv->stepper_d_node = NULL;
+ g_clear_object (&priv->stepper_d_gadget);
}
}
@@ -4345,5 +4318,5 @@ _gtk_range_set_steppers (GtkRange *range,
GtkCssNode *
gtk_range_get_trough_node (GtkRange *range)
{
- return range->priv->trough_node;
+ return gtk_css_gadget_get_node (range->priv->trough_gadget);
}
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7372a07..29d2dfb 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2035,6 +2035,24 @@ scrollbar {
button { border: none; }
+ &.vertical {
+ button.up {
+ -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+ }
+ button.down {
+ -gtk-icon-source: -gtk-icontheme('pan-up-symbolic');
+ }
+ }
+
+ &.horizontal {
+ button.up {
+ -gtk-icon-source: -gtk-icontheme('pan-right-symbolic');
+ }
+ button.down {
+ -gtk-icon-source: -gtk-icontheme('pan-left-symbolic');
+ }
+ }
+
&.overlay-indicator {
&:not(.dragging):not(.hovering) { // Overlay scrolling indicator
opacity: 0.4;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c692179..f240abc 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2525,6 +2525,14 @@ scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar bu
scrollbar .titlebar button.titlebutton,
.titlebar scrollbar button.titlebutton {
border: none; }
+scrollbar.vertical button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+scrollbar.vertical button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+scrollbar.horizontal button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
+scrollbar.horizontal button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
opacity: 0.4;
-GtkRange-slider-width: 5px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 61ea108..abd4104 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2535,6 +2535,14 @@ scrollbar button, scrollbar headerbar button.titlebutton, headerbar scrollbar bu
scrollbar .titlebar button.titlebutton,
.titlebar scrollbar button.titlebutton {
border: none; }
+scrollbar.vertical button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
+scrollbar.vertical button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
+scrollbar.horizontal button.up {
+ -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
+scrollbar.horizontal button.down {
+ -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
opacity: 0.4;
-GtkRange-slider-width: 5px; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
