github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Cocoa chameleon

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12270 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-09-10 17:27:05 +00:00
commit bc17571838
18 changed files with 305 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
uppsrc/CtrlCore/CtrlKbd.cpp
View file

@ -408,15 +408,20 @@ String GetKeyDesc(dword key)
if(key == 0)
return desc;
// TODO: Cocoa graphics https://tech.karbassi.com/2009/05/27/command-option-shift-symbols-in-unicode/
#ifdef PLATFORM_COCOA
if(key & K_KEYUP) desc << t_("key\vUP ");
if(key & K_CTRL) desc << t_("key\v⌘");
if(key & K_ALT) desc << t_("key\v⌃");
if(key & K_SHIFT) desc << t_("key\v⇧");
if(key & K_OPTION) desc << t_("key\v⌥");
key &= ~(K_CTRL | K_ALT | K_SHIFT | K_KEYUP | K_OPTION);
#else
if(key & K_KEYUP) desc << t_("key\vUP ");
if(key & K_CTRL) desc << t_("key\vCtrl+");
if(key & K_ALT) desc << t_("key\vAlt+");
if(key & K_SHIFT) desc << t_("key\vShift+");
#ifdef PLATFORM_COCOA
if(key & K_OPTION) desc << t_("key\vOption+");
key &= ~K_OPTION;
#endif
key &= ~(K_CTRL | K_ALT | K_SHIFT | K_KEYUP);
#endif
#ifdef PLATFORM_COCOA
key &= ~(K_OPTION);