diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2016-02-24 11:43:06 -0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2016-02-29 10:45:13 -0800 |
| commit | 6401e2405e19bd58db6dd826d7baa9926bcbd95f (patch) | |
| tree | 59c5ee00f03ef533f876454cdd88edb86e487798 /gtk/gtkrange.c | |
| parent | 06776d3d2fdfce734395739480bef721daf12608 (diff) | |
| download | gtk+-6401e2405e19bd58db6dd826d7baa9926bcbd95f.tar.gz | |
range: use new GtkBoxGadget API instead of removing/inserting
Diffstat (limited to 'gtk/gtkrange.c')
| -rw-r--r-- | gtk/gtkrange.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 32b1451b70..7658788924 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -662,24 +662,17 @@ gtk_range_sync_orientation (GtkRange *range) { GtkRangePrivate *priv = range->priv; GtkOrientation orientation; - int trough_pos = 0; orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (range)); _gtk_orientable_set_style_classes (GTK_ORIENTABLE (range)); gtk_box_gadget_set_orientation (GTK_BOX_GADGET (priv->gadget), orientation); - gtk_box_gadget_remove_gadget (GTK_BOX_GADGET (priv->gadget), priv->trough_gadget); - - if (priv->stepper_a_gadget) - trough_pos++; - if (priv->stepper_b_gadget) - trough_pos++; if (orientation == GTK_ORIENTATION_VERTICAL) - gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), trough_pos, - priv->trough_gadget, FALSE, TRUE, GTK_ALIGN_CENTER); + gtk_box_gadget_set_gadget_expand (GTK_BOX_GADGET (priv->gadget), + priv->trough_gadget, FALSE, TRUE); else - gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), trough_pos, - priv->trough_gadget, TRUE, FALSE, GTK_ALIGN_CENTER); + gtk_box_gadget_set_gadget_expand (GTK_BOX_GADGET (priv->gadget), + priv->trough_gadget, TRUE, FALSE); } static void @@ -807,6 +800,8 @@ gtk_range_init (GtkRange *range) priv->fill_level = G_MAXDOUBLE; priv->timer = NULL; + _gtk_orientable_set_style_classes (GTK_ORIENTABLE (range)); + widget_node = gtk_widget_get_css_node (GTK_WIDGET (range)); priv->gadget = gtk_box_gadget_new_for_node (widget_node, GTK_WIDGET (range)); @@ -819,7 +814,8 @@ gtk_range_init (GtkRange *range) NULL, NULL); gtk_css_gadget_set_state (priv->trough_gadget, gtk_css_node_get_state (widget_node)); - gtk_range_sync_orientation (range); + gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), -1, priv->trough_gadget, + TRUE, FALSE, GTK_ALIGN_CENTER); priv->slider_gadget = gtk_builtin_icon_new ("slider", GTK_WIDGET (range), |