Disable GUI enter key default events

In order to avoid confusion. To be enabled again once proper keyboard event handling will be implemented for GUI dialogs.
barotto · Dec 22, 2021 · c71f29a · c71f29a
1 parent 4c8f724
commit c71f29a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/src/gui/windows/fileselect.cpp b/src/gui/windows/fileselect.cpp
@@ -782,6 +782,11 @@ void FileSelect::on_keydown(Rml::Event &_ev)
 		case Rml::Input::KeyIdentifier::KI_ADD:
 			set_zoom(1);
 			break;
+		case Rml::Input::KeyIdentifier::KI_RETURN:
+		case Rml::Input::KeyIdentifier::KI_NUMPADENTER:
+			// TODO remove when proper keyboard input is implemented
+			_ev.StopImmediatePropagation();
+			break;
 		default:
 			Window::on_keydown(_ev);
 			break;

diff --git a/src/gui/windows/new_floppy.cpp b/src/gui/windows/new_floppy.cpp
@@ -161,8 +161,12 @@ void NewFloppy::on_keydown(Rml::Event &_ev)
 {
 	switch(get_key_identifier(_ev)) {
 		case Rml::Input::KeyIdentifier::KI_RETURN:
+		case Rml::Input::KeyIdentifier::KI_NUMPADENTER:
 			if(_ev.GetTargetElement() == m_filename_el) {
 				on_create_file(_ev);
+			} else {
+				// TODO remove when proper keyboard input is implemented
+				_ev.StopImmediatePropagation();
 			}
 			break;
 		default:

diff --git a/src/gui/windows/state_dialog.cpp b/src/gui/windows/state_dialog.cpp
@@ -328,6 +328,11 @@ void StateDialog::on_keydown(Rml::Event &_ev)
 		case Rml::Input::KeyIdentifier::KI_ADD:
 			set_zoom(1);
 			break;
+		case Rml::Input::KeyIdentifier::KI_RETURN:
+		case Rml::Input::KeyIdentifier::KI_NUMPADENTER:
+			// TODO remove when proper keyboard input is implemented
+			_ev.StopImmediatePropagation();
+			break;
 		default:
 			Window::on_keydown(_ev);
 			break;

diff --git a/src/gui/windows/state_save_info.cpp b/src/gui/windows/state_save_info.cpp
@@ -83,8 +83,12 @@ void StateSaveInfo::on_keydown(Rml::Event &_ev)
 {
 	switch(get_key_identifier(_ev)) {
 		case Rml::Input::KeyIdentifier::KI_RETURN:
+		case Rml::Input::KeyIdentifier::KI_NUMPADENTER:
 			if(_ev.GetTargetElement() == m_desc_el) {
 				on_save(_ev);
+			} else {
+				// TODO remove when proper keyboard input is implemented
+				_ev.StopImmediatePropagation();
 			}
 			break;
 		default: