feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix draggable priorities in 3D edit gizmos

Browse Source 
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 <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-06-26 16:25:46 +03:00
parent 97ac63b401
commit 2949504a9d
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml
View File

@@ -104,6 +104,7 @@ Model {
grabsMouse: targetNode grabsMouse: targetNode
active: rootModel.active active: rootModel.active
dragHelper: rootModel.dragHelper dragHelper: rootModel.dragHelper
priority: 5
onPressed: rootModel.handlePressed(mouseAreaYZ, planePos, screenPos) onPressed: rootModel.handlePressed(mouseAreaYZ, planePos, screenPos)
onDragged: rootModel.handleDragged(mouseAreaYZ, planePos, screenPos) onDragged: rootModel.handleDragged(mouseAreaYZ, planePos, screenPos)
@@ -121,6 +122,7 @@ Model {
grabsMouse: targetNode grabsMouse: targetNode
active: rootModel.active active: rootModel.active
dragHelper: rootModel.dragHelper dragHelper: rootModel.dragHelper
priority: 5
onPressed: rootModel.handlePressed(mouseAreaXZ, planePos, screenPos) onPressed: rootModel.handlePressed(mouseAreaXZ, planePos, screenPos)
onDragged: rootModel.handleDragged(mouseAreaXZ, planePos, screenPos) onDragged: rootModel.handleDragged(mouseAreaXZ, planePos, screenPos)

2
share/qtcreator/qml/qmlpuppet/mockfiles/MoveGizmo.qml
View File

@@ -161,7 +161,7 @@ Node {
color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0.5, 0.5, 0.5, 1)) color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0.5, 0.5, 0.5, 1))
: Qt.rgba(0.5, 0.5, 0.5, 1) : Qt.rgba(0.5, 0.5, 0.5, 1)
rotation: view3D.camera.rotation rotation: view3D.camera.rotation
priority: 1 priority: 10
targetNode: moveGizmo.targetNode targetNode: moveGizmo.targetNode
view3D: moveGizmo.view3D view3D: moveGizmo.view3D

2
share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml
View File

@@ -185,7 +185,7 @@ Node {
height: 120 height: 120
rotation: view3D.camera.rotation rotation: view3D.camera.rotation
grabsMouse: scaleGizmo.targetNode grabsMouse: scaleGizmo.targetNode
priority: 1 priority: 10
active: scaleGizmo.visible active: scaleGizmo.visible
dragHelper: scaleGizmo.dragHelper dragHelper: scaleGizmo.dragHelper