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

QmlDesigner: Some fixes to edit 3D after UX review

Browse Source 
- 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>
This commit is contained in:
Miikka Heikkinen
2019-11-18 13:10:54 +02:00
parent 77cb514a79
commit 4c73b4629c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,7 +138,7 @@ Window {
targetNode: viewWindow.selectedNode targetNode: viewWindow.selectedNode
position: viewWindow.selectedNode ? viewWindow.selectedNode.scenePosition position: viewWindow.selectedNode ? viewWindow.selectedNode.scenePosition
: Qt.vector3d(0, 0, 0) : Qt.vector3d(0, 0, 0)
globalOrientation: globalControl.checked globalOrientation: false
visible: selectedNode && btnScale.selected visible: selectedNode && btnScale.selected
view3D: overlayView view3D: overlayView

8
share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml
View File

@@ -61,13 +61,13 @@ Node {
width: iconImage.width width: iconImage.width
height: iconImage.height height: iconImage.height
x: -width / 2 x: -width / 2
y: -height y: -height / 2
color: "transparent" color: "transparent"
border.color: "#7777ff" border.color: "#7777ff"
border.width: iconGizmo.selectedNode === iconGizmo.targetNode border.width: iconGizmo.selectedNode !== iconGizmo.targetNode
|| (iconGizmo.highlightOnHover && iconMouseArea.containsMouse) ? 2 : 0 && iconGizmo.highlightOnHover && iconMouseArea.containsMouse ? 2 : 0
radius: 5 radius: 5
opacity: iconGizmo.selectedNode === iconGizmo.targetNode ? 0.3 : 1 opacity: iconGizmo.selectedNode === iconGizmo.targetNode ? 0.2 : 1
Image { Image {
id: iconImage id: iconImage
fillMode: Image.Pad fillMode: Image.Pad

3
share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml
View File

@@ -134,8 +134,7 @@ Node {
targetNode: rotateGizmo.targetNode targetNode: rotateGizmo.targetNode
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)
// Just a smidge smaller than higher priority rings so that it doesn't obscure them scale: Qt.vector3d(1.1, 1.1, 1.1)
scale: Qt.vector3d(0.994, 0.994, 0.994)
priority: 10 priority: 10
view3D: rotateGizmo.view3D view3D: rotateGizmo.view3D
active: rotateGizmo.visible active: rotateGizmo.visible