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

QmlDesigner: Fix states editor none visual items

Browse Source 
When using any none visual item as root (e.g. Window) which don't have
a state property the support for adding a state on the root item needs
to be deactivated otherwise QtDS is crashing. The new states editor was
missing that.
On the other hand the use of StatesGroup with none visual items is
supported.

Change-Id: I194913719a13099ce8ac7cde5f78083ef84dc37f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2022-11-25 15:44:32 +01:00
committed by Henning Gründl
parent ea55e01051
commit 62d86837e9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qmldesigner/newstateseditor/Main.qml
View File

@@ -863,6 +863,7 @@ Rectangle {
Item { Item {
id: addWrapper id: addWrapper
visible: canAddNewStates
Canvas { Canvas {
id: addCanvas id: addCanvas

8
src/plugins/qmldesigner/components/stateseditornew/stateseditorview.cpp
View File

@@ -105,6 +105,8 @@ void StatesEditorView::setActiveStatesGroupNode(const ModelNode &modelNode)
m_activeStatesGroupNode = modelNode; m_activeStatesGroupNode = modelNode;
resetModel(); resetModel();
checkForStatesAvailability();
emit m_statesEditorModel->activeStateGroupChanged(); emit m_statesEditorModel->activeStateGroupChanged();
emit m_statesEditorModel->activeStateGroupIndexChanged(); emit m_statesEditorModel->activeStateGroupIndexChanged();
} }
@@ -430,8 +432,10 @@ void StatesEditorView::resetStateGroups()
void StatesEditorView::checkForStatesAvailability() void StatesEditorView::checkForStatesAvailability()
{ {
if (m_statesEditorWidget) { if (m_statesEditorWidget) {
const bool isVisual = QmlVisualNode::isValidQmlVisualNode(activeStatesGroupNode()); const bool isVisual = activeStatesGroupNode().metaInfo().isBasedOn(
m_statesEditorWidget->showAddNewStatesButton(isVisual); model()->qtQuickItemMetaInfo(), model()->qtQuick3DNodeMetaInfo());
const bool isRoot = activeStatesGroupNode().isRootNode();
m_statesEditorWidget->showAddNewStatesButton(isVisual || !isRoot);
} }
} }