[gtk/spinbutton-localized-digits-3] spinbutton: Interpret localized digits
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/spinbutton-localized-digits-3] spinbutton: Interpret localized digits
- Date: Tue, 30 Mar 2021 02:10:17 +0000 (UTC)
commit fa69e5f42ddf4cc2808a84053a002084b5f50441
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Nov 24 13:42:29 2020 -0500
spinbutton: Interpret localized digits
Interpret input where the characters have numeric values.
See #3387
gtk/gtkspinbutton.c | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9498aad33d..8e65d8a272 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -1883,12 +1883,41 @@ gtk_spin_button_default_input (GtkSpinButton *spin_button,
gdouble *new_val)
{
gchar *err = NULL;
+ const char *text;
- *new_val = g_strtod (gtk_entry_get_text (GTK_ENTRY (spin_button)), &err);
+ text = gtk_entry_get_text (GTK_ENTRY (spin_button));
+
+ *new_val = g_strtod (text, &err);
if (*err)
- return GTK_INPUT_ERROR;
- else
- return FALSE;
+ {
+ /* try to convert with local digits */
+ gint64 val = 0;
+ int sign = 1;
+ const char *p;
+
+ for (p = text; *p; p = g_utf8_next_char (p))
+ {
+ gunichar ch = g_utf8_get_char (p);
+
+ if (p == text && ch == '-')
+ {
+ sign = -1;
+ continue;
+ }
+
+ if (!g_unichar_isdigit (ch))
+ break;
+
+ val = val * 10 + g_unichar_digit_value (ch);
+ }
+
+ if (*p)
+ return GTK_INPUT_ERROR;
+
+ *new_val = sign * val;
+ }
+
+ return FALSE;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]