diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-05-09 15:04:23 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-05-09 15:05:51 -0400 |
| commit | 9edcb6fbe23b14c84de5454c12e380279081437b (patch) | |
| tree | 08259cb319ae54be1b59ad8640a6fb72e2e15c85 | |
| parent | f90f7af3df5ef739b7d7ba537ec4821eef39ebe4 (diff) | |
| download | eclipse.platform.swt-9edcb6fbe23b14c84de5454c12e380279081437b.tar.gz eclipse.platform.swt-9edcb6fbe23b14c84de5454c12e380279081437b.tar.xz eclipse.platform.swt-9edcb6fbe23b14c84de5454c12e380279081437b.zip | |
Bug 379042 - SWT.DragDetect should not be sent when left clicking with Ctrl down
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java index 62ad825242..3a364001f1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java @@ -2498,7 +2498,7 @@ boolean mouseEvent (int /*long*/ id, int /*long*/ sel, int /*long*/ theEvent, in switch (nsType) { case OS.NSLeftMouseDown: - if (nsEvent.clickCount() == 1 && (state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect)) { + if (nsEvent.clickCount() == 1 && (nsEvent.modifierFlags() & OS.NSControlKeyMask) == 0 && (state & DRAG_DETECT) != 0 && hooks (SWT.DragDetect)) { consume = new boolean[1]; NSPoint location = view.convertPoint_fromView_(nsEvent.locationInWindow(), null); if (!view.isFlipped ()) { |