diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-10-27 18:15:52 +0300 |
|---|---|---|
| committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-10-28 08:20:26 +0000 |
| commit | 2a4de97a84e21641d076d84d550d38d5e3c4a2af (patch) | |
| tree | 160db2bf31b31828228ac7271540341b2b7d3b94 | |
| parent | 564298bba5a4c830d8e14a9e59360c23ee6c5e0d (diff) | |
| download | qt-creator-2a4de97a84e21641d076d84d550d38d5e3c4a2af.tar.gz | |
QmlDesigner: Fix toggle section expand after choosing expand all
Fixes: QDS-8104
Change-Id: I6191a7b249490e6193acdd8b618c0817a3fc6ab3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml | 2 | ||||
| -rw-r--r-- | share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml index 7ee927f250..55b284ba49 100644 --- a/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml +++ b/share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml @@ -270,6 +270,8 @@ Item { expanded: bundleCategoryExpanded expandOnClick: false onToggleExpand: bundleCategoryExpanded = !bundleCategoryExpanded + onExpand: bundleCategoryExpanded = true + onCollapse: bundleCategoryExpanded = false Grid { width: scrollView.width diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml index 69cf7c7795..0c7b83878e 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Section.qml @@ -72,10 +72,19 @@ Item { Connections { target: Controller function onCollapseAll() { - if (collapsible) - section.expanded = false + if (collapsible) { + if (section.expandOnClick) + section.expanded = false + else + section.collapse() + } + } + function onExpandAll() { + if (section.expandOnClick) + section.expanded = true + else + section.expand() } - function onExpandAll() { section.expanded = true } } signal drop(var drag) @@ -83,6 +92,8 @@ Item { signal dropExit() signal showContextMenu() signal toggleExpand() + signal expand() + signal collapse() DropArea { id: dropArea |