forked from qt-creator/qt-creator
QmlDesigner: Show crosshair only after there is a move in fly mode
Fixes: QDS-12596 Change-Id: Id34ad1b0745814a5b3dee8b6c3001d19ca7f4118 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -29,6 +29,7 @@ Item {
|
|||||||
readonly property real _keyPanAmount: 1.0
|
readonly property real _keyPanAmount: 1.0
|
||||||
property bool ignoreToolState: false
|
property bool ignoreToolState: false
|
||||||
property bool flyMode: viewRoot.flyMode
|
property bool flyMode: viewRoot.flyMode
|
||||||
|
property bool hasMovedInFlyMode: false
|
||||||
|
|
||||||
z: 10
|
z: 10
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
@@ -173,11 +174,15 @@ Item {
|
|||||||
|
|
||||||
function rotateCamera(angles)
|
function rotateCamera(angles)
|
||||||
{
|
{
|
||||||
|
if (flyMode)
|
||||||
|
hasMovedInFlyMode = true;
|
||||||
cameraCtrl._lookAtPoint = _generalHelper.rotateCamera(camera, angles, _lookAtPoint);
|
cameraCtrl._lookAtPoint = _generalHelper.rotateCamera(camera, angles, _lookAtPoint);
|
||||||
}
|
}
|
||||||
|
|
||||||
function moveCamera(moveVec)
|
function moveCamera(moveVec)
|
||||||
{
|
{
|
||||||
|
if (flyMode)
|
||||||
|
hasMovedInFlyMode = true;
|
||||||
cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint, moveVec);
|
cameraCtrl._lookAtPoint = _generalHelper.moveCamera(camera, _lookAtPoint, moveVec);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,7 +248,8 @@ Item {
|
|||||||
cameraCtrl._dragging = false;
|
cameraCtrl._dragging = false;
|
||||||
cameraCtrl.storeCameraState(0);
|
cameraCtrl.storeCameraState(0);
|
||||||
}
|
}
|
||||||
_generalHelper.stopAllCameraMoves()
|
hasMovedInFlyMode = false;
|
||||||
|
_generalHelper.stopAllCameraMoves();
|
||||||
_generalHelper.setCameraSpeedModifier(1.0);
|
_generalHelper.setCameraSpeedModifier(1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -262,7 +268,7 @@ Item {
|
|||||||
Image {
|
Image {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
source: "qrc:///qtquickplugin/mockfiles/images/crosshair.png"
|
source: "qrc:///qtquickplugin/mockfiles/images/crosshair.png"
|
||||||
visible: cameraCtrl.flyMode && viewRoot.activeSplit === cameraCtrl.splitId
|
visible: cameraCtrl.hasMovedInFlyMode && viewRoot.activeSplit === cameraCtrl.splitId
|
||||||
opacity: 0.7
|
opacity: 0.7
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user