git.iko.soy/unity8
on xenial help sign in
Use the categoryId, not the item.objectName, they have the same contents but objectName feels a bit wrong to use
9edbf3bAlbert Astals
Dash/GenericScopeView.qml+3−3
compare with xenial
unifiedsplit
@@ -66,7 +66,7 @@ ScopeView {
66
66
67 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false
67 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false
68 readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true
68 readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true
69− readonly property string category: rendererLoader.item ? rendererLoader.item.objectName : ""
69+ readonly property string category: categoryId
70
70
71 Loader {
71 Loader {
72 id: rendererLoader
72 id: rendererLoader
@@ -88,7 +88,7 @@ ScopeView {
88 }
88 }
89 item.objectName = Qt.binding(function() { return categoryId })
89 item.objectName = Qt.binding(function() { return categoryId })
90 if (item.expandable) {
90 if (item.expandable) {
91− var shouldFilter = item.objectName != categoryView.expandedCategoryId;
91+ var shouldFilter = categoryId != categoryView.expandedCategoryId;
92 if (shouldFilter != item.filter) {
92 if (shouldFilter != item.filter) {
93 item.filter = shouldFilter;
93 item.filter = shouldFilter;
94 }
94 }
@@ -127,7 +127,7 @@ ScopeView {
127 onExpandedCategoryIdChanged: {
127 onExpandedCategoryIdChanged: {
128 var item = rendererLoader.item;
128 var item = rendererLoader.item;
129 if (item.expandable) {
129 if (item.expandable) {
130− var shouldFilter = item.objectName != categoryView.expandedCategoryId;
130+ var shouldFilter = categoryId != categoryView.expandedCategoryId;
131 if (shouldFilter != item.filter) {
131 if (shouldFilter != item.filter) {
132 // If the filter animation will be seen start it, otherwise, just flip the switch
132 // If the filter animation will be seen start it, otherwise, just flip the switch
133 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;
133 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;