feat(picking): now "drag drop rotation gizmo" will not trigger pick

Wonder-Technology · Feb 7, 2019 · 60d002e · 60d002e
1 parent 0592a20
commit 60d002e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/core/job/init/InitPickingJob.re b/src/core/job/init/InitPickingJob.re
@@ -217,7 +217,7 @@ let _handlePicking = (event: EventType.customEvent, engineState) => {
 let _isHandlePicking = (event, editorState) =>
   MouseEventService.isLeftMouseButton(event)
   && !
-       SelectTranslationGizmoSceneViewEditorService.isSelectAnyTranslationGizmo(
+       SelectTransformGizmoSceneViewEditorService.isSelectAnyTransformGizmo(
          editorState,
        );
 

diff --git a/...rvice/state/editor/view/sceneView/transform/SelectTransformGizmoSceneViewEditorService.re b/...rvice/state/editor/view/sceneView/transform/SelectTransformGizmoSceneViewEditorService.re
@@ -1,4 +1,12 @@
 let markNotSelectAnyTransformGizmo = editorState =>
   editorState
   |> SelectTranslationGizmoSceneViewEditorService.markNotSelectAnyTranslationGizmo
-  |> SelectRotationGizmoSceneViewEditorService.markNotSelectAnyRotationGizmo;
+  |> SelectRotationGizmoSceneViewEditorService.markNotSelectAnyRotationGizmo;
+
+let isSelectAnyTransformGizmo = editorState =>
+  SelectTranslationGizmoSceneViewEditorService.isSelectAnyTranslationGizmo(
+    editorState,
+  )
+  || SelectRotationGizmoSceneViewEditorService.isSelectAnyRotationGizmo(
+       editorState,
+     );