livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-15500: Restore fix for FIRE-11648 that got lost in the merge with LL V3.7.21

Ansariel 2015-02-08 02:11:07 +01:00
parent 0a9bcdca7d
commit 998ccb3fee
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llwindow/llopenglview-objc.mm
View File

@ -443,10 +443,12 @@ attributedStringInfo getSegments(NSAttributedString *str)
// OS X intentionally does not send us key-up information on cmd-key combinations.
// This behaviour is not a bug, and only applies to cmd-combinations (no others).
// Since SL assumes we receive those, we fake it here.
if (mModifiers & NSCommandKeyMask && !mHasMarkedText)
{
callKeyUp([theEvent keyCode], mModifiers);
}
// <FS:Ansariel> Cinder Roxley's fix for FIRE-11648
//if (mModifiers & NSCommandKeyMask && !mHasMarkedText)
//{
// callKeyUp([theEvent keyCode], mModifiers);
//}
// </FS:Ansariel>
}
- (void)flagsChanged:(NSEvent *)theEvent