diff options
| author | Timm Bäder <mail@baedert.org> | 2017-05-05 20:34:17 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-07-19 21:27:12 -0400 |
| commit | 9e796847625d1ef2503dbb9731feb44483b821cc (patch) | |
| tree | d793897cbc4158705ec386f9d4b139a3e034db74 | |
| parent | 2cedf1be9c61064b8a92b6fd3e591d9a9acc6357 (diff) | |
| download | gtk+-9e796847625d1ef2503dbb9731feb44483b821cc.tar.gz | |
range: Remove gadget completely
| -rw-r--r-- | gtk/gtkrange.c | 15 | ||||
| -rw-r--r-- | gtk/gtkrangeprivate.h | 1 |
2 files changed, 6 insertions, 10 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index b59171abbe..1f7ab2b99d 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -90,7 +90,6 @@ struct _GtkRangePrivate /* Steppers are: < > ---- < > * a b c d */ - GtkCssGadget *gadget; GtkCssGadget *contents_gadget; GtkCssGadget *stepper_a_gadget; GtkCssGadget *stepper_b_gadget; @@ -632,15 +631,12 @@ gtk_range_init (GtkRange *range) _gtk_orientable_set_style_classes (GTK_ORIENTABLE (range)); widget_node = gtk_widget_get_css_node (GTK_WIDGET (range)); - priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node, - GTK_WIDGET (range), - NULL, - NULL, - NULL, - NULL, NULL); priv->contents_gadget = gtk_box_gadget_new ("contents", GTK_WIDGET (range), - priv->gadget, NULL); + NULL, NULL); + gtk_css_node_set_parent (gtk_css_gadget_get_node (priv->contents_gadget), + widget_node); + priv->trough_gadget = gtk_css_custom_gadget_new ("trough", GTK_WIDGET (range), NULL, NULL, @@ -1551,7 +1547,6 @@ gtk_range_finalize (GObject *object) g_clear_object (&priv->multipress_gesture); g_clear_object (&priv->long_press_gesture); - g_clear_object (&priv->gadget); g_clear_object (&priv->contents_gadget); g_clear_object (&priv->trough_gadget); g_clear_object (&priv->fill_gadget); @@ -3099,8 +3094,10 @@ gtk_range_update_mouse_location (GtkRange *range) priv->mouse_location = priv->slider_gadget; else if (rectangle_contains_point (&slider_trace, x, y)) priv->mouse_location = priv->trough_gadget; +#if 0 else if (gtk_css_gadget_margin_box_contains_point (priv->gadget, x, y)) priv->mouse_location = priv->gadget; +#endif else priv->mouse_location = NULL; diff --git a/gtk/gtkrangeprivate.h b/gtk/gtkrangeprivate.h index a3d35b361f..e5e0c55e43 100644 --- a/gtk/gtkrangeprivate.h +++ b/gtk/gtkrangeprivate.h @@ -27,7 +27,6 @@ #include <gtk/gtkrange.h> -#include <gtk/gtkcssgadgetprivate.h> #include <gtk/gtkcssnodeprivate.h> |