diff options
| author | Geenz <geenz@geenzo.com> | 2013-07-11 22:07:17 -0400 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-07-11 22:07:17 -0400 |
| commit | dea416fd83497d22147b3c0abab1bf1240e472dd (patch) | |
| tree | 0e36a652641cbe390b8e1f3449e2b0b2b33b08d2 /indra/llwindow | |
| parent | 2f680eec93f1b06620c04af04116fe49d577cf8f (diff) | |
Rework the command+click functionality a bit to ensure we're not mistakenly simulating a right click where we shouldn't.
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index 42ad4f8723..5f34d03c35 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -243,7 +243,13 @@ attributedStringInfo getSegments(NSAttributedString *str) - (void) mouseDown:(NSEvent *)theEvent { // Apparently people still use this? - if ([theEvent modifierFlags] & NSControlKeyMask) + if ([theEvent modifierFlags] & NSCommandKeyMask && + !([theEvent modifierFlags] & NSControlKeyMask) && + !([theEvent modifierFlags] & NSShiftKeyMask) && + !([theEvent modifierFlags] & NSAlternateKeyMask) && + !([theEvent modifierFlags] & NSAlphaShiftKeyMask) && + !([theEvent modifierFlags] & NSFunctionKeyMask) && + !([theEvent modifierFlags] & NSHelpKeyMask)) { callRightMouseDown(mMousePos, mModifiers); mSimulatedRightClick = true; |