summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-10-21 14:51:29 +0200
committerMorten Johan Sørvig <morten.sorvig@digia.com>2014-10-24 08:44:48 +0200
commita38ecb4c67432b55c3040f0bcc79fa3f8d875690 (patch)
tree67d16138f7e207ea7797db7159dd58ac0e9c75d2
parent4d7e587a78799a390968615cdfe02a30f566a337 (diff)
Cocoa: Don't send FrameStrut events during drags
Check the (normal) button state and return early if there is a pressed button. Task-number: QTBUG-41609 Change-Id: I69d23f02e55627ca3e03f2466103e0952ff442b3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 9b6a3f9ef4..aa57fc211e 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -721,6 +721,10 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
- (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent
{
// get m_buttons in sync
+ // Don't send frme strut events if we are in the middle of a mouse drag.
+ if (m_buttons != Qt::NoButton)
+ return;
+
NSEventType ty = [theEvent type];
switch (ty) {
case NSLeftMouseDown: