From 2a4de97a84e21641d076d84d550d38d5e3c4a2af Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Thu, 27 Oct 2022 18:15:52 +0300
Subject: [PATCH] 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>
---
 .../MaterialBrowser.qml                         |  2 ++
 .../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 7ee927f250a..55b284ba493 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 69cf7c77953..0c7b83878e6 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