diff options
Diffstat (limited to 'src')
3 files changed, 14 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index 04d658f9b7..828247b6f1 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -28,6 +28,7 @@ #include "stateseditorview.h" #include "stateseditorimageprovider.h" +#include <designersettings.h> #include <theming.h> #include <invalidqmlsourceexception.h> @@ -137,11 +138,20 @@ void StatesEditorWidget::reloadQmlSource() m_statesEditorView.data()->synchonizeCurrentStateFromWidget(); setFixedHeight(initialSize().height()); - connect(rootObject(), SIGNAL(expandedChanged()), this, SLOT(changeHeight())); + if (!DesignerSettings::getValue(DesignerSettingsKey::STATESEDITOR_EXPANDED).toBool()) { + toggleStatesViewExpanded(); + setFixedHeight(rootObject()->height()); + } + + connect(rootObject(), SIGNAL(expandedChanged()), this, SLOT(handleExpandedChanged())); } -void StatesEditorWidget::changeHeight() +void StatesEditorWidget::handleExpandedChanged() { + bool expanded = rootObject()->property("expanded").toBool(); + + DesignerSettings::setValue(DesignerSettingsKey::STATESEDITOR_EXPANDED, expanded); + setFixedHeight(rootObject()->height()); } } diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h index 474f81bbe3..7387c9ba6e 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h @@ -63,7 +63,7 @@ public: private slots: void reloadQmlSource(); - void changeHeight(); + void handleExpandedChanged(); private: QPointer<StatesEditorView> m_statesEditorView; diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index baff3623dc..fbcb1f67fb 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -61,6 +61,7 @@ const char REFORMAT_UI_QML_FILES[] = "ReformatUiQmlFiles"; /* This Setting is no The setting can be used to turn off the feature, if there are serious issues */ const char TEXTEDIT_IN_DESIGNMODE[] = "TextEditInDesignMode"; +const char STATESEDITOR_EXPANDED[] = "StatesEditorExpanded"; } class DesignerSettings : public QHash<QByteArray, QVariant> |