[gtk+/gtk-3-22] Revert "Scale: Always sync ::digits to Range::round-digits"



commit 9f8b1a8aa8e7a6bc6bdb40795ffa036e372333a5
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Apr 26 06:18:09 2017 -0400

    Revert "Scale: Always sync ::digits to Range::round-digits"
    
    This reverts commit 4a6bd134bdc192b4830a1c6228e27332d4629418.
    
    This change in behavior broke various things.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781605

 gtk/gtkscale.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index bde630f..5f7720a 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1148,7 +1148,8 @@ gtk_scale_set_digits (GtkScale *scale,
   if (priv->digits != digits)
     {
       priv->digits = digits;
-      gtk_range_set_round_digits (range, digits);
+      if (priv->draw_value)
+        gtk_range_set_round_digits (range, digits);
 
       gtk_scale_clear_value_layout (scale);
       gtk_widget_queue_resize (GTK_WIDGET (scale));
@@ -1340,6 +1341,7 @@ gtk_scale_set_draw_value (GtkScale *scale,
           else
             gtk_css_node_insert_before (widget_node, gtk_css_gadget_get_node (priv->value_gadget), NULL);
 
+          gtk_range_set_round_digits (GTK_RANGE (scale), priv->digits);
           update_value_position (scale);
         }
       else
@@ -1347,6 +1349,8 @@ gtk_scale_set_draw_value (GtkScale *scale,
           if (priv->value_gadget)
             gtk_css_node_set_parent (gtk_css_gadget_get_node (priv->value_gadget), NULL);
           g_clear_object (&priv->value_gadget);
+
+          gtk_range_set_round_digits (GTK_RANGE (scale), -1);
         }
 
       gtk_scale_clear_value_layout (scale);


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