dc09664 · unity8 · git.iko.soy

on xenial help sign in

Merge

dc09664Albert Astals Cid11 years ago

qml/Dash/GenericScopeView.qml+6−1

@@ -43,6 +43,7 @@ FocusScope {

43 property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible

44 property var holdingList: null

45 property bool wasCurrentOnMoveStart: false

46+ property var filtersPopover: null

47 property var scopeStyle: ScopeStyle {

48 property var scopeStyle: ScopeStyle {

48 style: scope ? scope.customizations : {}

49 style: scope ? scope.customizations : {}

@@ -141,6 +142,10 @@ FocusScope {

141 }

142 }

142 categoryView.pageHeader.resetSearch();

143 categoryView.pageHeader.resetSearch();

143 subPageLoader.closeSubPage();

144 subPageLoader.closeSubPage();

145+ if (filtersPopover) {

146+ PopupUtils.close(filtersPopover)

147+ scopeView.filtersPopover = null;

148+ }

144 }

149 }

145

150

146 Binding {

151 Binding {

@@ -655,7 +660,7 @@ FocusScope {

655 }

660 }

656 }

661 }

657 onShowFiltersPopup: { // item

662 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) } );

659 }

664 }

660 }

665 }

661

666