From 2949504a9de89cfe4106cb9de7d846e486e3ad65 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 26 Jun 2020 16:25:46 +0300 Subject: [PATCH] QmlDesigner: Fix draggable priorities in 3D edit gizmos Upped default priority of all directional draggables a bit to make them preferable to free rotation ball. Change-Id: If934cb723e8c1a8ca9a114d71b19cbfc196e2682 Fixes: QDS-2286 Reviewed-by: Mahmoud Badri --- .../qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml | 2 ++ share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml | 2 +- share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml index 1401333627c..e88b9c4c51c 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml @@ -104,6 +104,7 @@ Model { grabsMouse: targetNode active: rootModel.active dragHelper: rootModel.dragHelper + priority: 5 onPressed: rootModel.handlePressed(mouseAreaYZ, planePos, screenPos) onDragged: rootModel.handleDragged(mouseAreaYZ, planePos, screenPos) @@ -121,6 +122,7 @@ Model { grabsMouse: targetNode active: rootModel.active dragHelper: rootModel.dragHelper + priority: 5 onPressed: rootModel.handlePressed(mouseAreaXZ, planePos, screenPos) onDragged: rootModel.handleDragged(mouseAreaXZ, planePos, screenPos) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml index adb6f23a483..493e6cc3c25 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml @@ -161,7 +161,7 @@ Node { color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0.5, 0.5, 0.5, 1)) : Qt.rgba(0.5, 0.5, 0.5, 1) rotation: view3D.camera.rotation - priority: 1 + priority: 10 targetNode: moveGizmo.targetNode view3D: moveGizmo.view3D diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml index ccfc45b6211..3b4918e272c 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml @@ -185,7 +185,7 @@ Node { height: 120 rotation: view3D.camera.rotation grabsMouse: scaleGizmo.targetNode - priority: 1 + priority: 10 active: scaleGizmo.visible dragHelper: scaleGizmo.dragHelper