Skip to content

Commit 9cd297b

Browse files
committed
Merge pull request godotengine#107487 from roughbits01/fix-shortcut-names
Remove the need to have a display name for built-in action overrides
2 parents 3f34e38 + 6dd5266 commit 9cd297b

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

core/input/input_map.cpp

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -358,40 +358,26 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
358358
{ "ui_text_dedent", TTRC("Dedent") },
359359
{ "ui_text_backspace", TTRC("Backspace") },
360360
{ "ui_text_backspace_word", TTRC("Backspace Word") },
361-
{ "ui_text_backspace_word.macos", TTRC("Backspace Word") },
362361
{ "ui_text_backspace_all_to_left", TTRC("Backspace all to Left") },
363-
{ "ui_text_backspace_all_to_left.macos", TTRC("Backspace all to Left") },
364362
{ "ui_text_delete", TTRC("Delete") },
365363
{ "ui_text_delete_word", TTRC("Delete Word") },
366-
{ "ui_text_delete_word.macos", TTRC("Delete Word") },
367364
{ "ui_text_delete_all_to_right", TTRC("Delete all to Right") },
368-
{ "ui_text_delete_all_to_right.macos", TTRC("Delete all to Right") },
369365
{ "ui_text_caret_left", TTRC("Caret Left") },
370366
{ "ui_text_caret_word_left", TTRC("Caret Word Left") },
371-
{ "ui_text_caret_word_left.macos", TTRC("Caret Word Left") },
372367
{ "ui_text_caret_right", TTRC("Caret Right") },
373368
{ "ui_text_caret_word_right", TTRC("Caret Word Right") },
374-
{ "ui_text_caret_word_right.macos", TTRC("Caret Word Right") },
375369
{ "ui_text_caret_up", TTRC("Caret Up") },
376370
{ "ui_text_caret_down", TTRC("Caret Down") },
377371
{ "ui_text_caret_line_start", TTRC("Caret Line Start") },
378-
{ "ui_text_caret_line_start.macos", TTRC("Caret Line Start") },
379372
{ "ui_text_caret_line_end", TTRC("Caret Line End") },
380-
{ "ui_text_caret_line_end.macos", TTRC("Caret Line End") },
381373
{ "ui_text_caret_page_up", TTRC("Caret Page Up") },
382374
{ "ui_text_caret_page_down", TTRC("Caret Page Down") },
383375
{ "ui_text_caret_document_start", TTRC("Caret Document Start") },
384-
{ "ui_text_caret_document_start.macos", TTRC("Caret Document Start") },
385376
{ "ui_text_caret_document_end", TTRC("Caret Document End") },
386-
{ "ui_text_caret_document_end.macos", TTRC("Caret Document End") },
387377
{ "ui_text_caret_add_below", TTRC("Caret Add Below") },
388-
{ "ui_text_caret_add_below.macos", TTRC("Caret Add Below") },
389378
{ "ui_text_caret_add_above", TTRC("Caret Add Above") },
390-
{ "ui_text_caret_add_above.macos", TTRC("Caret Add Above") },
391379
{ "ui_text_scroll_up", TTRC("Scroll Up") },
392-
{ "ui_text_scroll_up.macos", TTRC("Scroll Up") },
393380
{ "ui_text_scroll_down", TTRC("Scroll Down") },
394-
{ "ui_text_scroll_down.macos", TTRC("Scroll Down") },
395381
{ "ui_text_select_all", TTRC("Select All") },
396382
{ "ui_text_select_word_under_caret", TTRC("Select Word Under Caret") },
397383
{ "ui_text_add_selection_for_next_occurrence", TTRC("Add Selection for Next Occurrence") },
@@ -409,7 +395,7 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
409395
{ "ui_filedialog_show_hidden", TTRC("Show Hidden") },
410396
{ "ui_filedialog_find", TTRC("Find") },
411397
{ "ui_filedialog_focus_path", TTRC("Focus Path") },
412-
{ "ui_swap_input_direction ", TTRC("Swap Input Direction") },
398+
{ "ui_swap_input_direction", TTRC("Swap Input Direction") },
413399
{ "ui_unicode_start", TTRC("Start Unicode Character Input") },
414400
{ "ui_colorpicker_delete_preset", TTRC("ColorPicker: Delete Preset") },
415401
{ "ui_accessibility_drag_and_drop", TTRC("Accessibility: Keyboard Drag and Drop") },
@@ -418,10 +404,10 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
418404
};
419405

420406
String InputMap::get_builtin_display_name(const String &p_name) const {
407+
const String name = p_name.get_slicec('.', 0);
421408
constexpr int len = std_size(_builtin_action_display_names);
422-
423409
for (int i = 0; i < len; i++) {
424-
if (_builtin_action_display_names[i].name == p_name) {
410+
if (_builtin_action_display_names[i].name == name) {
425411
return _builtin_action_display_names[i].display_name;
426412
}
427413
}

0 commit comments

Comments
 (0)