[gtk+/wip/cosimoc/range-gadget: 28/33] range: better hack for GtkColorScale



commit 9f03d19dd7b2121b96603ddf3bdd51dcf6404416
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Feb 27 23:19:13 2016 -0800

    range: better hack for GtkColorScale
    
    Just draw the slider, since that is the only thing GtkColorScale cares
    about.

 gtk/gtkrange.c |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)
---
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 419be48..e8f04d5 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2314,28 +2314,17 @@ gtk_range_render (GtkCssGadget *gadget,
   GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
   GtkRange *range = GTK_RANGE (widget);
   GtkRangePrivate *priv = range->priv;
-  gboolean draw_trough = TRUE;
 
   /* HACK: we can't render the contents box directly because
    * GtkColorScale wants to omit the trough but still draw the slider...
    */
   if (GTK_IS_COLOR_SCALE (widget))
-      draw_trough = FALSE;
-
-  if (draw_trough)
-    gtk_css_gadget_draw (priv->trough_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);
+    {
+      gtk_css_gadget_draw (priv->slider_gadget, cr);
+      return FALSE;
+    }
 
-  if (priv->stepper_d_gadget)
-    gtk_css_gadget_draw (priv->stepper_d_gadget, cr);
+  gtk_css_gadget_draw (priv->contents_gadget, cr);
 
   return FALSE;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]