From 91f23fcf2d7ac3c918e63e838d5c8e22d591cdc9 Mon Sep 17 00:00:00 2001
From: barnold1953 <brb555@utk.edu>
Date: Thu, 12 Jun 2014 15:39:40 -0700
Subject: [PATCH] Fix for click and drag with sixense

---
 interface/src/devices/SixenseManager.cpp | 12 +++++++++++-
 interface/src/ui/ApplicationOverlay.cpp  |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/interface/src/devices/SixenseManager.cpp b/interface/src/devices/SixenseManager.cpp
index bce55ae362..4df08c6966 100644
--- a/interface/src/devices/SixenseManager.cpp
+++ b/interface/src/devices/SixenseManager.cpp
@@ -381,7 +381,17 @@ void SixenseManager::emulateMouse(PalmData* palm, int index) {
     if (pos.x() != _oldX[index] || pos.y() != _oldY[index]) {
         QMouseEvent mouseEvent(static_cast<QEvent::Type>(CONTROLLER_MOVE_EVENT), pos, Qt::NoButton, Qt::NoButton, 0);
 
-        Application::getInstance()->mouseMoveEvent(&mouseEvent);
+        //Only send the mouse event if the opposite left button isnt held down.
+        //This is specifically for edit voxels
+        if (triggerButton == Qt::LeftButton) {
+            if (!_triggerPressed[(int)(!index)]) {
+                Application::getInstance()->mouseMoveEvent(&mouseEvent);
+            }
+        } else {
+            if (!_bumperPressed[(int)(!index)]) {
+                Application::getInstance()->mouseMoveEvent(&mouseEvent);
+            }
+        } 
     }
     _oldX[index] = pos.x();
     _oldY[index] = pos.y();
diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index 9af3ed6d02..ae6b49c560 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -289,7 +289,6 @@ void ApplicationOverlay::renderPointers() {
         mouseX -= pointerWidth / 2.0f;
         mouseY += pointerHeight / 2.0f;
 
-
         glBegin(GL_QUADS);
 
         glColor3f(1, 0, 0);