[gtk+/wip/cosimoc/range-gadget: 9/26] Revert "range: simplify code"

[Cosimo Cecchi <cosimoc src gnome org>]

commit ea9c5f0cd6f3429c0b4ef66cdb5afb7040c70ba7
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Feb 22 18:54:16 2016 -0800

    Revert "range: simplify code"
    
    This reverts commit a74f7dcaf8a02c96c6bfecab6969e1d33ecb9332.

 gtk/gtkrange.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 8ed2366..3dcd634 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2259,8 +2259,6 @@ gtk_range_render_trough (GtkCssGadget *gadget,
   if (priv->has_origin)
     gtk_css_gadget_draw (priv->highlight_gadget, cr);
 
-  gtk_css_gadget_draw (priv->slider_gadget, cr);
-
   return gtk_widget_has_visible_focus (widget);
 }
 
@@ -2271,7 +2269,20 @@ gtk_range_draw (GtkWidget *widget,
   GtkRange *range = GTK_RANGE (widget);
   GtkRangePrivate *priv = range->priv;
 
-  gtk_css_gadget_draw (priv->gadget, cr);
+  gtk_css_gadget_draw (priv->trough_gadget, cr);
+  gtk_css_gadget_draw (priv->slider_gadget, cr);
+
+  if (priv->stepper_a_gadget)
+    gtk_css_gadget_draw (priv->stepper_a_gadget, cr);
+
+  if (priv->stepper_b_gadget)
+    gtk_css_gadget_draw (priv->stepper_b_gadget, cr);
+
+  if (priv->stepper_c_gadget)
+    gtk_css_gadget_draw (priv->stepper_c_gadget, cr);
+
+  if (priv->stepper_d_gadget)
+    gtk_css_gadget_draw (priv->stepper_d_gadget, cr);
 
   return GDK_EVENT_PROPAGATE;
 }