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
1573 return;1573 return;
1574 }1574 }
1575 1575
1576 _keyboardMouseDevice.mouseMoveEvent(event, deviceID);1576 if (deviceID == 0) {
1577 _keyboardMouseDevice.mouseMoveEvent(event, deviceID);
1578 }
1577 1579
1578}1580}
1579 1581
@@ -1594,7 +1596,9 @@ void Application::mousePressEvent(QMouseEvent* event, unsigned int deviceID) { · 14 unmodified lines
1594 1596
1595 1597
1596 if (activeWindow() == _window) {1598 if (activeWindow() == _window) {
1597 _keyboardMouseDevice.mousePressEvent(event);1599 if (deviceID == 0) {
1600 _keyboardMouseDevice.mousePressEvent(event);
1601 }
1598 1602
1599 if (event->button() == Qt::LeftButton) {1603 if (event->button() == Qt::LeftButton) {
1600 _mouseDragStarted = getTrueMouse();1604 _mouseDragStarted = getTrueMouse();
@@ -1634,7 +1638,9 @@ void Application::mouseReleaseEvent(QMouseEvent* event, unsigned int deviceID) { · 33 unmodified lines
1634 }1638 }
1635 1639
1636 if (activeWindow() == _window) {1640 if (activeWindow() == _window) {
1637 _keyboardMouseDevice.mouseReleaseEvent(event);1641 if (deviceID == 0) {
1642 _keyboardMouseDevice.mouseReleaseEvent(event);
1643 }
1638 1644
1639 if (event->button() == Qt::LeftButton) {1645 if (event->button() == Qt::LeftButton) {
1640 _mousePressed = false;1646 _mousePressed = false;