QmlDesigner: Some fixes to edit 3D after UX review

- Slightly larger cam plane rotate ring to avoid overlap
- Scale tool is always local
- Little more transparent and borderless light/cam icons when selected
- Center light/cam icon on the object

Change-Id: Icb24d89fb3ea852b139677aebe797881a12e474a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

3 files changed, 6 insertions, 7 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
index a4d63962d8..da5a5a4950 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml
@@ -138,7 +138,7 @@ Window {
             targetNode: viewWindow.selectedNode
             position: viewWindow.selectedNode ? viewWindow.selectedNode.scenePosition
                                               : Qt.vector3d(0, 0, 0)
-            globalOrientation: globalControl.checked
+            globalOrientation: false
             visible: selectedNode && btnScale.selected
             view3D: overlayView
 
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml
index 8623b87a84..f41fbad0be 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml
@@ -61,13 +61,13 @@ Node {
             width: iconImage.width
             height: iconImage.height
             x: -width / 2
-            y: -height
+            y: -height / 2
             color: "transparent"
             border.color: "#7777ff"
-            border.width: iconGizmo.selectedNode === iconGizmo.targetNode
-                          || (iconGizmo.highlightOnHover && iconMouseArea.containsMouse) ? 2 : 0
+            border.width: iconGizmo.selectedNode !== iconGizmo.targetNode
+                          && iconGizmo.highlightOnHover && iconMouseArea.containsMouse ? 2 : 0
             radius: 5
-            opacity: iconGizmo.selectedNode === iconGizmo.targetNode ? 0.3 : 1
+            opacity: iconGizmo.selectedNode === iconGizmo.targetNode ? 0.2 : 1
             Image {
                 id: iconImage
                 fillMode: Image.Pad
diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml
index b2f42b39e2..b730e86910 100644
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml
@@ -134,8 +134,7 @@ Node {
         targetNode: rotateGizmo.targetNode
         color: highlightOnHover && (hovering || dragging) ? Qt.lighter(Qt.rgba(0.5, 0.5, 0.5, 1))
                                                           : Qt.rgba(0.5, 0.5, 0.5, 1)
-        // Just a smidge smaller than higher priority rings so that it doesn't obscure them
-        scale: Qt.vector3d(0.994, 0.994, 0.994)
+        scale: Qt.vector3d(1.1, 1.1, 1.1)
         priority: 10
         view3D: rotateGizmo.view3D
         active: rotateGizmo.visible