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

QmlDesigner: Fix mouse cursor state handling in 3D view

Browse Source 
Mouse cursor state is always reported separately and it should not
affect other tool state handling, so handle it first and don't do
any default handling if the key is missing.

Fixes: QDS-15342
Change-Id: I190713b3b97707749f3503ebd9058c72e0b401e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2025-05-12 14:43:40 +03:00
parent de855b3a79
commit 2656cdb86f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -128,6 +128,13 @@ void Edit3DView::renderImage3DChanged(const QImage &img)
void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState) void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState)
{ {
const QString mouseCursorKey = QStringLiteral("mouseCursor");
if (sceneState.contains(mouseCursorKey)) {
setMouseCursor(sceneState[mouseCursorKey].toInt());
// Mouse cursor state is always reported separately, as we never want to persist this state
return;
}
const QString activeViewportKey = QStringLiteral("activeViewport"); const QString activeViewportKey = QStringLiteral("activeViewport");
if (sceneState.contains(activeViewportKey)) { if (sceneState.contains(activeViewportKey)) {
setActiveViewport(sceneState[activeViewportKey].toInt()); setActiveViewport(sceneState[activeViewportKey].toInt());
@@ -139,15 +146,6 @@ void Edit3DView::updateActiveScene3D(const QVariantMap &sceneState)
setActiveViewport(0); setActiveViewport(0);
} }
const QString mouseCursorKey = QStringLiteral("mouseCursor");
if (sceneState.contains(mouseCursorKey)) {
setMouseCursor(sceneState[mouseCursorKey].toInt());
if (sceneState.size() == 1)
return;
} else {
setMouseCursor(-1);
}
const QString sceneKey = QStringLiteral("sceneInstanceId"); const QString sceneKey = QStringLiteral("sceneInstanceId");
const QString selectKey = QStringLiteral("selectionMode"); const QString selectKey = QStringLiteral("selectionMode");
const QString transformKey = QStringLiteral("transformMode"); const QString transformKey = QStringLiteral("transformMode");