dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-29 15:22:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

clapper-gtk: extra-menu-button: Make text->number conversion more forgiving

Browse Source 
Try to parse into a number as much of the string as possible, without caring
about a sign suffix. This way input will be more forgiving instead of resetting
itself to lowest allowed number.

Also when a number exceeds allowed range, set it to maximal allowed value
instead of once again resetting to minimum.
This commit is contained in:
Rafał Dzięgiel
2024-04-11 20:43:11 +02:00
parent 6f1277a2e6
commit ca73b3a3ef
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/clapper-gtk/clapper-gtk-extra-menu-button.c
View File

@@ -128,12 +128,12 @@ static gint
volume_spin_input_cb (GtkSpinButton *spin_button, gdouble *value, ClapperGtkExtraMenuButton *self)
{
const gchar *text = gtk_editable_get_text (GTK_EDITABLE (spin_button));
gchar *sign = NULL;
gdouble volume = g_strtod (text, &sign);
gdouble volume = g_strtod (text, NULL);
if (volume < 0 || volume > 200
|| (sign && sign[0] != '\0' && sign[0] != '%'))
return GTK_INPUT_ERROR;
if (volume < 0)
volume = 0;
else if (volume > 200)
volume = 200;
volume /= 100.0;
@@ -173,12 +173,12 @@ static gint
speed_spin_input_cb (GtkSpinButton *spin_button, gdouble *value, ClapperGtkExtraMenuButton *self)
{
const gchar *text = gtk_editable_get_text (GTK_EDITABLE (spin_button));
gchar *sign = NULL;
gdouble speed = g_strtod (text, &sign);
gdouble speed = g_strtod (text, NULL);
if (speed < 0.05 || speed > 2.0
|| (sign && sign[0] != '\0' && sign[0] != 'x'))
return GTK_INPUT_ERROR;
if (speed < 0.05)
speed = 0.05;
else if (speed > 2.0)
speed = 2.0;
if (speed > 0.99 && speed < 1.01)
speed = 1.0;