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

QmlDesigner: Do not keep separate selection state

Browse Source 
When nodes are deleted the selection can changes without a notifier.
There is no reason to keep the selection separately.

Change-Id: I166d3695762e3d5cd6ff4808586384fd26bafef4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Thomas Hartmann
2020-10-05 10:16:54 +02:00
parent 634bb8afb4
commit fe7d928f3b
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/components/connectioneditor/bindingmodel.cpp
View File

@@ -53,10 +53,10 @@ void BindingModel::resetModel()
{ {
beginResetModel(); beginResetModel();
clear(); clear();
setHorizontalHeaderLabels(QStringList({ tr("Item"), tr("Property"), tr("Source Item"), setHorizontalHeaderLabels(
tr("Source Property") })); QStringList({tr("Item"), tr("Property"), tr("Source Item"), tr("Source Property")}));
foreach (const ModelNode modelNode, m_selectedModelNodes) for (const ModelNode modelNode : connectionView()->selectedModelNodes())
addModelNode(modelNode); addModelNode(modelNode);
endResetModel(); endResetModel();
@@ -100,7 +100,6 @@ void BindingModel::bindingRemoved(const BindingProperty &bindingProperty)
void BindingModel::selectionChanged(const QList<ModelNode> &selectedNodes) void BindingModel::selectionChanged(const QList<ModelNode> &selectedNodes)
{ {
m_handleDataChanged = false; m_handleDataChanged = false;
m_selectedModelNodes = selectedNodes;
resetModel(); resetModel();
m_handleDataChanged = true; m_handleDataChanged = true;
} }

1
src/plugins/qmldesigner/components/connectioneditor/bindingmodel.h
View File

@@ -80,7 +80,6 @@ private:
void handleException(); void handleException();
private: private:
QList<ModelNode> m_selectedModelNodes;
ConnectionView *m_connectionView; ConnectionView *m_connectionView;
bool m_lock = false; bool m_lock = false;
bool m_handleDataChanged = false; bool m_handleDataChanged = false;

7
src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
View File

@@ -128,10 +128,10 @@ void DynamicPropertiesModel::resetModel()
{ {
beginResetModel(); beginResetModel();
clear(); clear();
setHorizontalHeaderLabels(QStringList({ tr("Item"), tr("Property"), tr("Property Type"), setHorizontalHeaderLabels(
tr("Property Value") })); QStringList({tr("Item"), tr("Property"), tr("Property Type"), tr("Property Value")}));
foreach (const ModelNode modelNode, m_selectedModelNodes) for (const ModelNode modelNode : connectionView()->selectedModelNodes())
addModelNode(modelNode); addModelNode(modelNode);
endResetModel(); endResetModel();
@@ -279,7 +279,6 @@ void DynamicPropertiesModel::bindingRemoved(const BindingProperty &bindingProper
void DynamicPropertiesModel::selectionChanged(const QList<ModelNode> &selectedNodes) void DynamicPropertiesModel::selectionChanged(const QList<ModelNode> &selectedNodes)
{ {
m_handleDataChanged = false; m_handleDataChanged = false;
m_selectedModelNodes = selectedNodes;
resetModel(); resetModel();
m_handleDataChanged = true; m_handleDataChanged = true;
} }

1
src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.h
View File

@@ -96,7 +96,6 @@ private:
void handleException(); void handleException();
private: private:
QList<ModelNode> m_selectedModelNodes;
ConnectionView *m_connectionView; ConnectionView *m_connectionView;
bool m_lock = false; bool m_lock = false;
bool m_handleDataChanged = false; bool m_handleDataChanged = false;