[gtk+] Revert "Scale: Always sync ::digits to Range::round-digits"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "Scale: Always sync ::digits to Range::round-digits"
- Date: Wed, 26 Apr 2017 11:30:31 +0000 (UTC)
commit 197355e15ac10bc05b7eed34c9eae6fa33b9f5c4
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 0c04288..180e18e 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -1115,7 +1115,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));
@@ -1307,6 +1308,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
@@ -1314,6 +1316,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]