liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #6148, allow using decimal key on numpad

Browse Source
This commit is contained in:
Pandagrapher 2021-03-01 21:04:08 +01:00
parent 2366cb4935
commit d92bbf59e1
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rtgui/guiutils.cc
View File

@ -1172,6 +1172,7 @@ MySpinButton::MySpinButton ()
set_numeric(true);
set_wrap(false);
set_alignment(Gtk::ALIGN_END);
set_update_policy(Gtk::SpinButtonUpdatePolicy::UPDATE_IF_VALID); // Avoid updating text if input is not a numeric
}
void MySpinButton::updateSize()
@ -1204,19 +1205,16 @@ bool MySpinButton::on_key_press_event (GdkEventKey* event)
double vMin, vMax;
get_range(vMin, vMax);
if ( (event->string[0] >= 'a' && event->string[0] <= 'z')
|| (event->string[0] >= 'A' && event->string[0] <= 'Z')
|| event->string[0] == '+' || (event->string[0] == '-' && vMin >= 0)
|| event->string[0] == '=' || event->string[0] == '_'
) {
return false;
if (event->keyval == GDK_KEY_plus || (event->keyval == GDK_KEY_minus && vMin >= 0)) {
return true; // Event is not propagated further
} else {
if(event->string[0] == ',') {
event->keyval = GDK_KEY_period;
event->string[0] = '.';
if (event->keyval == GDK_KEY_comma || event->keyval == GDK_KEY_KP_Decimal) {
set_text(get_text() + ".");
set_position(get_text().length()); // When setting text, cursor position is reseted at text start. Avoiding this with this code
return true; // Event is not propagated further
}
return Gtk::Widget::on_key_press_event(event);
return Gtk::SpinButton::on_key_press_event(event); // Event is propagated normally
}
}