History

Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL

ZappoMan committed 11 years ago

Commit efa20012 parents 410e0a9 62fca6110 files · +296 −239Browse files

Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all

Unified · Split

interface/src/Application.cpp+9−3
@@ -1573,7 +1573,9 @@ void Application::mouseMoveEvent(QMouseEvent* event, unsigned int deviceID) { · 1572 unmodified lines
15731573 return;
15741574 }
15751575
1576− _keyboardMouseDevice.mouseMoveEvent(event, deviceID);
1576+ if (deviceID == 0) {
1577+ _keyboardMouseDevice.mouseMoveEvent(event, deviceID);
1578+ }
15771579
15781580 }
15791581
@@ -1594,7 +1596,9 @@ void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) { · 14 unmodified lines
15941596
15951597
15961598 if (activeWindow() == _window) {
1597− _keyboardMouseDevice.mousePressEvent(event);
1599+ if (deviceID == 0) {
1600+ _keyboardMouseDevice.mousePressEvent(event);
1601+ }
15981602
15991603 if (event->button() == Qt::LeftButton) {
16001604 _mouseDragStarted = getTrueMouse();
@@ -1634,7 +1638,9 @@ void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) { · 33 unmodified lines
16341638 }
16351639
16361640 if (activeWindow() == _window) {
1637− _keyboardMouseDevice.mouseReleaseEvent(event);
1641+ if (deviceID == 0) {
1642+ _keyboardMouseDevice.mouseReleaseEvent(event);
1643+ }
16381644
16391645 if (event->button() == Qt::LeftButton) {
16401646 _mousePressed = false;