on xenial help sign in
Merge
commit40dee3deae37ed1d57a864a235425c4ad1040a54 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 22 Jan 2016, 21:03 (11 years ago) parente8c9643dc09664
1 file changed+6−1
qml/Dash/GenericScopeView.qml+6−1
qml/Dash/GenericScopeView.qml+6−1
@@ -43,6 +43,7 @@ FocusScope {
4343 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
4444 property var holdingList: null
4545 property bool wasCurrentOnMoveStart: false
46+ property var filtersPopover: null
4647
4748 property var scopeStyle: ScopeStyle {
4849 style: scope ? scope.customizations : {}
@@ -141,6 +142,10 @@ FocusScope {
141142 }
142143 categoryView.pageHeader.resetSearch();
143144 subPageLoader.closeSubPage();
145+ if (filtersPopover) {
146+ PopupUtils.close(filtersPopover)
147+ scopeView.filtersPopover = null;
148+ }
144149 }
145150
146151 Binding {
@@ -655,7 +660,7 @@ FocusScope {
655660 }
656661 }
657662 onShowFiltersPopup: { // item
658− PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
663+ scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
659664 }
660665 }
661666