AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: improve mouse button tracking warnings

Browse Source 
The warnings about "Internal mouse button tracking invalid" should check
for the correct button before emitting a warning. The warning should
also mention the correct button as well. For otherMouseDragged, we
simply check for any button that's not the left or right button.

Change-Id: I9eb6d6bd7fb5919e745b7f8eb517b4bc9efd36a6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
This commit is contained in:
Bradley T. Hughes 2012-03-21 11:08:14 +01:00 committed by Qt by Nokia
parent 7445d41e32
commit 5672e1affe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -304,7 +304,7 @@ static QTouchDevice *touchDevice = 0;
- (void)mouseDragged:(NSEvent *)theEvent
{
if (!(m_buttons & Qt::LeftButton))
qWarning("Internal Mousebutton tracking invalid(missing Qt::LeftButton");
qWarning("QNSView mouseDragged: Internal mouse button tracking invalid (missing Qt::LeftButton)");
[self handleMouseEvent:theEvent];
}
@ -339,8 +339,8 @@ static QTouchDevice *touchDevice = 0;
- (void)rightMouseDragged:(NSEvent *)theEvent
{
if (!(m_buttons & Qt::LeftButton))
qWarning("Internal Mousebutton tracking invalid(missing Qt::LeftButton");
if (!(m_buttons & Qt::RightButton))
qWarning("QNSView rightMouseDragged: Internal mouse button tracking invalid (missing Qt::RightButton)");
[self handleMouseEvent:theEvent];
}
@ -404,8 +404,8 @@ static QTouchDevice *touchDevice = 0;
- (void)otherMouseDragged:(NSEvent *)theEvent
{
if (!(m_buttons & Qt::LeftButton))
qWarning("Internal Mousebutton tracking invalid(missing Qt::LeftButton");
if (!(m_buttons & ~(Qt::LeftButton | Qt::RightButton)))
qWarning("QNSView otherMouseDragged: Internal mouse button tracking invalid (missing Qt::MiddleButton or Qt::ExtraButton*)");
[self handleMouseEvent:theEvent];
}