From c7ffb75558a9a5af97f2da04c4572f5df3e3ee4c Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 2 Oct 2011 10:19:16 +0200 Subject: [PATCH] Bugfixes to work with GtkSpinButton. --- libgtkform/fieldfloat.c | 21 ++++++++++++++++++++- libgtkform/fieldinteger.c | 5 ++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/libgtkform/fieldfloat.c b/libgtkform/fieldfloat.c index b4e82d8..b42a190 100644 --- a/libgtkform/fieldfloat.c +++ b/libgtkform/fieldfloat.c @@ -372,7 +372,26 @@ gtk_form_field_float_is_valid (GtkFormField *field) if (str_value != NULL && g_strcmp0 (g_strstrip (str_value), "") != 0) { - str_format = g_strdup_printf ("%%0%dd", 6 - (str_comma != NULL ? strlen (str_comma) - 1 : 0)); + if (str_comma == NULL) + { + str_format = g_strdup ("%%06d"); + } + else + { + if (strlen (str_comma) < 6) + { + str_format = g_strdup_printf ("%%0%dd", 6 - strlen (str_comma) - 1); + } + else + { + if (strlen (str_comma) > 6) + { + str_value = g_strndup (str_value, strlen (str_value) - strlen (str_comma) + 7); + } + str_format = NULL; + } + } + if (g_strcmp0 (g_strdup_printf ("%f", dbl_value), g_strdup_printf (g_strconcat ("%s", (str_comma == NULL ? "," : ""), str_format, NULL), str_value, 0)) != 0) { g_free (str_value); diff --git a/libgtkform/fieldinteger.c b/libgtkform/fieldinteger.c index 0d3519a..f9b18f3 100644 --- a/libgtkform/fieldinteger.c +++ b/libgtkform/fieldinteger.c @@ -23,6 +23,7 @@ #include #include "widget.h" +#include "widgetspin.h" #include "fieldinteger.h" enum @@ -314,7 +315,9 @@ gtk_form_field_integer_is_valid (GtkFormField *field) if (str_value != NULL && g_strcmp0 (g_strstrip (str_value), "") != 0) { - if (g_strcmp0 (g_strdup_printf ("%d", value), str_value) != 0) + if (g_strcmp0 (g_strconcat (g_strdup_printf ("%d", value), + IS_GTK_FORM_WIDGET_SPIN (fw) ? g_strdup_printf (",%06d", 0) : "", NULL), + str_value) != 0) { g_free (str_value); return FALSE; -- 2.49.0