Fix #1558: Keypad Enter Not working in file Rename dialog

#1558 Also ensure GDK_KEY_KP_Enter is an alternative to GDK_KEY_Return throughout the project.
BestImageViewer · Dec 15, 2024 · ba0e043 · ba0e043
1 parent 3c56255
commit ba0e043
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/bar.cc b/src/bar.cc
@@ -293,7 +293,7 @@ static void height_spin_changed_cb(GtkSpinButton *spin, gpointer data)
 
 static void height_spin_key_press_cb(GtkEventControllerKey *, gint keyval, guint, GdkModifierType, gpointer data)
 {
-	if ((keyval == GDK_KEY_Return || keyval == GDK_KEY_Escape))
+	if ((keyval == GDK_KEY_Return || keyval == GDK_KEY_KP_Enter || keyval == GDK_KEY_Escape))
 		{
 		gq_gtk_widget_destroy(GTK_WIDGET(data));
 		}

diff --git a/src/search-and-run.cc b/src/search-and-run.cc
@@ -193,6 +193,7 @@ static gboolean keypress_cb(GtkWidget *, GdkEventKey *event, gpointer data)
 			ret = TRUE;
 			break;
 		case GDK_KEY_Return:
+		case GDK_KEY_KP_Enter:
 			break;
 		default:
 			sar->match_found = FALSE;

diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc
@@ -143,7 +143,7 @@ static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventK
 {
 	auto gd = static_cast<GenericDialog *>(data);
 
-	if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
+	if ((event->keyval == (GDK_KEY_Return) || (event->keyval == GDK_KEY_KP_Enter)) && gtk_widget_has_focus(widget)
 	    && gd->default_cb)
 		{
 		gboolean auto_close;