InputState enum divided

Task-number: QTRD-2683

Change-Id: Ib05469ac1bf8c8ed828974a3adb91ecb5f8f1fc9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp
index 27ebf89d..9e19df0c 100644
--- a/src/datavisualization/input/q3dinputhandler.cpp
+++ b/src/datavisualization/input/q3dinputhandler.cpp
@@ -91,17 +91,18 @@ void Q3DInputHandler::mousePressEvent(QMouseEvent *event, const QPoint &mousePos
     if (Qt::LeftButton == event->button()) {
         if (scene()->isSlicingActive()) {
             if (scene()->isPointInPrimarySubView(mousePos)) {
-                setInputState(InputStateOnPrimaryView);
+                setInputView(InputViewOnPrimary);
             } else if (scene()->isPointInSecondarySubView(mousePos)) {
-                setInputState(InputStateOnSecondaryView);
+                setInputView(InputViewOnSecondary);
             } else {
-                setInputState(InputStateNone);
+                setInputView(InputViewNone);
             }
         } else {
-            setInputState(InputStateOnScene);
             // update mouse positions to prevent jumping when releasing or repressing a button
             setInputPosition(mousePos);
             scene()->setSelectionQueryPosition(mousePos);
+            setInputView(InputViewOnPrimary);
+            setInputState(InputStateSelecting);
         }
     } else if (Qt::MiddleButton == event->button()) {
         // reset rotations
@@ -131,6 +132,7 @@ void Q3DInputHandler::mouseReleaseEvent(QMouseEvent *event, const QPoint &mouseP
         setInputPosition(mousePos);
     }
     setInputState(InputStateNone);
+    setInputView(InputViewNone);
 #endif
 }