@@ -53,11 +53,18 @@ ScopeView {
5353 onAtYEndChanged: if (atYEnd) endReached()
5454 onMovingChanged: if (moving && atYEnd) endReached()
5555
56+ property int expandedIndex: -1
57+
5658 delegate: ListItems.Base {
5759 highlightWhenPressed: false
5860
59− function headerClicked() {
61+ function toggleCollapse() {
6062 if (rendererLoader.item.expandable) {
63+ if (index != categoryView.expandedIndex && categoryView.expandedIndex != -1) {
64+ var obj = categoryView.item(categoryView.expandedIndex);
65+ if (obj)
66+ obj.toggleCollapse();
67+ }
6168 rendererLoader.item.filter = !rendererLoader.item.filter;
6269 }
6370 }
@@ -103,8 +110,10 @@ ScopeView {
103110 delegateItem.model.metadata)
104111 }
105112 onFilterChanged: {
106− if (!target.filter)
113+ if (!target.filter) {
107114 categoryView.maximizeVisibleArea(index);
115+ categoryView.expandedIndex = index
116+ }
108117 }
109118 }
110119 }
@@ -117,7 +126,7 @@ ScopeView {
117126 onClicked: {
118127 var obj = categoryView.item(delegateIndex);
119128 if (obj)
120− obj.headerClicked();
129+ obj.toggleCollapse();
121130 }
122131 }
123132 pageHeader: PageHeader {