[Libreoffice-commits] core.git: vcl/osx

[heiko tietze]

 vcl/osx/salframe.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e422efcaff1bf789343a73a16e46b00f303e3032
Author: heiko tietze <tietze.heiko at gmail.com>
Date:   Mon Apr 16 12:11:33 2018 +0200

    tdf#117033 - Tooltips show the wrong symbol for MOD3 combinations
    
    Symbol for MOD3 added
    
    Change-Id: Idb76199fbff240fe39c96ed837db098a4283d70b
    Reviewed-on: https://gerrit.libreoffice.org/52957
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 7b5b203668d8..31159f8545c0 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1026,13 +1026,13 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
     if( it != aKeyMap.end() )
     {
         if( (nKeyCode & KEY_SHIFT) != 0 )
-            aResult.append( u'\x21e7' );
+            aResult.append( u'\x21e7' ); //⇧
         if( (nKeyCode & KEY_MOD1) != 0 )
-            aResult.append( u'\x2318' );
-        // we do not really handle Alt (see below)
-        // we map it to MOD3, which is actually Command
-        if( (nKeyCode & (KEY_MOD2|KEY_MOD3)) != 0 )
-            aResult.append( u'\x2325' );
+            aResult.append( u'\x2318' ); //⌘
+        if( (nKeyCode & KEY_MOD2) != 0 )
+            aResult.append( u'\x2325' ); //⌥
+        if( (nKeyCode & KEY_MOD3) != 0 )
+            aResult.append( u'\x2303' ); //⌃
 
         aResult.append( it->second );
     }