diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2016-02-24 12:24:41 -0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2016-02-28 12:30:43 -0800 |
| commit | b496206a3ab957f61409834676c9eddcd508cd0e (patch) | |
| tree | 7eaba9d4553a73ea135738f403f541a3f582d8e0 | |
| parent | b73b92f5097ec918a60f2e47d6eca72cbfd48a20 (diff) | |
| download | gtk+-b496206a3ab957f61409834676c9eddcd508cd0e.tar.gz | |
scale: always add marks at the beginning or the end
Marks are always either the first or the last child of the scale.
| -rw-r--r-- | gtk/gtkrange.c | 6 | ||||
| -rw-r--r-- | gtk/gtkrangeprivate.h | 1 | ||||
| -rw-r--r-- | gtk/gtkscale.c | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 40843eb54c..cebabaf836 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -3924,12 +3924,6 @@ _gtk_range_set_steppers (GtkRange *range, gtk_widget_queue_resize (GTK_WIDGET (range)); } -GtkCssNode * -gtk_range_get_trough_node (GtkRange *range) -{ - return gtk_css_gadget_get_node (range->priv->trough_gadget); -} - GtkCssGadget * gtk_range_get_slider_gadget (GtkRange *range) { diff --git a/gtk/gtkrangeprivate.h b/gtk/gtkrangeprivate.h index 0b0a875cd2..4376b0347a 100644 --- a/gtk/gtkrangeprivate.h +++ b/gtk/gtkrangeprivate.h @@ -49,7 +49,6 @@ void _gtk_range_set_steppers (GtkRange *range gboolean has_c, gboolean has_d); -GtkCssNode *gtk_range_get_trough_node (GtkRange *range); GtkCssGadget *gtk_range_get_slider_gadget (GtkRange *range); G_END_DECLS diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 32e068505c..523bccb327 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -1650,7 +1650,7 @@ gtk_scale_add_mark (GtkScale *scale, widget_node = gtk_widget_get_css_node (GTK_WIDGET (scale)); priv->top_marks_node = gtk_css_node_new (); gtk_css_node_set_name (priv->top_marks_node, I_("marks")); - gtk_css_node_insert_before (widget_node, priv->top_marks_node, gtk_range_get_trough_node (GTK_RANGE (scale))); + gtk_css_node_insert_after (widget_node, priv->top_marks_node, NULL); gtk_css_node_set_parent (priv->top_marks_node, widget_node); gtk_css_node_add_class (priv->top_marks_node, g_quark_from_static_string (GTK_STYLE_CLASS_TOP)); gtk_css_node_set_state (priv->top_marks_node, gtk_css_node_get_state (widget_node)); @@ -1665,7 +1665,7 @@ gtk_scale_add_mark (GtkScale *scale, widget_node = gtk_widget_get_css_node (GTK_WIDGET (scale)); priv->bottom_marks_node = gtk_css_node_new (); gtk_css_node_set_name (priv->bottom_marks_node, I_("marks")); - gtk_css_node_insert_after (widget_node, priv->bottom_marks_node, gtk_range_get_trough_node (GTK_RANGE (scale))); + gtk_css_node_insert_before (widget_node, priv->bottom_marks_node, NULL); gtk_css_node_add_class (priv->bottom_marks_node, g_quark_from_static_string (GTK_STYLE_CLASS_BOTTOM)); gtk_css_node_set_state (priv->bottom_marks_node, gtk_css_node_get_state (widget_node)); g_object_unref (priv->bottom_marks_node); |