griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Shortcut String Changes

Browse Source 
Improvements to keyboard shortcuts shown in menus, mostly for Macs.

Differential Revision: https://developer.blender.org/D6730

Reviewed by Brecht Van Lommel
This commit is contained in:
Harley Acheson
2020-02-01 08:56:38 -08:00
parent 63d5b974cc
commit f051d47cdb
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/windowmanager/intern/wm_keymap.c
View File

@@ -1109,12 +1109,13 @@ const char *WM_key_event_string(const short type, const bool compact)
case LEFTCTRLKEY:
case RIGHTCTRLKEY:
if (platform == MACOS) {
return "^";
return key_event_glyph_or_text(font_id, "^", "\xe2\x8c\x83");
}
return IFACE_("Ctrl");
case LEFTALTKEY:
case RIGHTALTKEY: {
if (platform == MACOS) {
/* Option symbol on Mac keyboard. */
single_glyph = "\xe2\x8c\xa5";
}
return key_event_glyph_or_text(font_id, IFACE_("Alt"), single_glyph);
@@ -1124,28 +1125,23 @@ const char *WM_key_event_string(const short type, const bool compact)
return key_event_glyph_or_text(font_id, IFACE_("Cmd"), "\xe2\x8c\x98");
}
else if (platform == MSWIN) {
return key_event_glyph_or_text(font_id, IFACE_("Win"), "\xe2\x8a\x9e");
return key_event_glyph_or_text(font_id, IFACE_("Win"), "\xe2\x9d\x96");
}
return IFACE_("OSkey");
return IFACE_("OS");
} break;
case TABKEY: {
if (platform == MACOS) {
single_glyph = "\xe2\x86\xb9";
}
return key_event_glyph_or_text(font_id, IFACE_("Tab"), single_glyph);
}
case TABKEY:
return key_event_glyph_or_text(font_id, IFACE_("Tab"), "\xe2\xad\xbe");
case BACKSPACEKEY:
return key_event_glyph_or_text(font_id, IFACE_("Bksp"), "\xe2\x8c\xab");
case ESCKEY:
return key_event_glyph_or_text(font_id, IFACE_("Esc"), NULL /* "\xe2\x8e\x8b" */);
case RETKEY: {
if (platform == MACOS) {
single_glyph = "\xe2\x8f\x8e";
single_glyph = "\xe2\x8e\x8b";
}
return key_event_glyph_or_text(font_id, IFACE_("Enter"), single_glyph);
}
return key_event_glyph_or_text(font_id, IFACE_("Esc"), single_glyph);
case RETKEY:
return key_event_glyph_or_text(font_id, IFACE_("Enter"), "\xe2\x86\xb5");
case SPACEKEY:
return key_event_glyph_or_text(font_id, IFACE_("Space"), NULL /* "\xe2\x90\xa3" */);
return key_event_glyph_or_text(font_id, IFACE_("Space"), "\xe2\x90\xa3");
case LEFTARROWKEY:
return key_event_glyph_or_text(font_id, IFACE_("Left"), "\xe2\x86\x90");
case UPARROWKEY: