#1213 Don't let ENTER close mapping panel

helgoboss · Sep 25, 2024 · 875e062 · 875e062
1 parent 9eaf442
commit 875e062
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 114 deletions.
diff --git a/dialogs/src/mapping_panel.rs b/dialogs/src/mapping_panel.rs
@@ -729,16 +729,19 @@ pub fn create(context: ScopedContext, ids: &mut IdGenerator) -> Dialog {
  "<=",
  ids.named_id("ID_MAPPING_PANEL_PREVIOUS_BUTTON"),
  context.rect(160, 514, 30, 14),
- ) + NOT_WS_TABSTOP,
- ok_button(
+ ),
+ // We make this a normal push button instead of an OK button so that
+ // pressing enter in a text field doesn't automatically trigger it.
+ pushbutton(
+ "OK",
  ids.named_id("ID_MAPPING_PANEL_OK"),
  context.rect(200, 514, 50, 14),
  ),
  pushbutton(
  "=>",
  ids.named_id("ID_MAPPING_PANEL_NEXT_BUTTON"),
  context.rect(260, 514, 30, 14),
- ) + NOT_WS_TABSTOP,
+ ),
  context.checkbox(
  "Enabled",
  ids.named_id("IDC_MAPPING_ENABLED_CHECK_BOX"),