Make Windows handle key equivalents in menus correctly. Make the menu display the string properly on Windows too.

This commit is contained in:
Ross Boucher committed 2009-12-16 18:58:21 -05:00
1 parent d2cd3b899f
commit 5527e585f6
2 files changed
+35 -8

No files matched your search

+10 -1
View File
@@ -920,7 +920,16 @@ var _CPMenuBarVisible = NO,
for(; index < count; ++index)
{
var item = _items[index],
modifierMask = [item keyEquivalentModifierMask] | ([item keyEquivalent] === [[item keyEquivalent] uppercaseString] ? CPShiftKeyMask : 0);
modifierMask = [item keyEquivalentModifierMask];
if ([item keyEquivalent] === [[item keyEquivalent] uppercaseString])
modifierMask |= CPShiftKeyMask;
if (CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && (modifierMask & CPCommandKeyMask))
{
modifierMask |= CPControlKeyMask;
modifierMask &= ~CPCommandKeyMask;
}
if ((modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) == modifierMask &&
[characters caseInsensitiveCompare:[item keyEquivalent]] == CPOrderedSame)
+25 -7
View File
@@ -590,16 +590,34 @@ CPControlKeyMask
if (![_keyEquivalent length])
return @"";
var string = _keyEquivalent.toUpperCase();
var string = _keyEquivalent.toUpperCase(),
needsShift = _keyEquivalentModifierMask & CPShiftKeyMask || string === _keyEquivalent;
if (_keyEquivalentModifierMask & CPCommandKeyMask)
string = "⌘" + string;
if (CPBrowserIsOperatingSystem(CPMacOperatingSystem))
{
if (_keyEquivalentModifierMask & CPCommandKeyMask)
string = "⌘" + string;
if (_keyEquivalentModifierMask & CPShiftKeyMask)
string = "⇧" + string;
if (needsShift)
string = "⇧" + string;
if (_keyEquivalentModifierMask & CPControlKeyMask)
string = "^" + string;
if (_keyEquivalentModifierMask & CPAlternateKeyMask)
string = "⌥" + string;
if (_keyEquivalentModifierMask & CPControlKeyMask)
string = "^" + string;
}
else
{
if (needsShift)
string = "Shift-" + string;
if (_keyEquivalentModifierMask & CPAlternateKeyMask)
string = "Alt-" + string;
if (_keyEquivalentModifierMask & CPControlKeyMask || _keyEquivalentModifierMask & CPCommandKeyMask)
string = "Ctrl-" + string;
}
return string;
}