@@ -25,7 +25,7 @@ import "../Components/ListItems" as ListItems
2525FocusScope {
2626 id: scopeView
2727
28− readonly property bool navigationDisableParentInteractive: pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].disableParentInteractive : false
28+ readonly property bool navigationDisableParentInteractive: categoryView.pageHeader.bottomItem[0].disableParentInteractive
2929 property bool forceNonInteractive: false
3030 property var scope: null
3131 property UnitySortFilterProxyModel categories: categoryFilter
@@ -34,7 +34,6 @@ FocusScope {
3434 property bool hasBackAction: false
3535 property bool enableHeightBehaviorOnNextCreation: false
3636 property var categoryView: categoryView
37− property bool showPageHeader: true
3837 readonly property alias subPageShown: subPageLoader.subPageShown
3938 property int paginationCount: 0
4039 property int paginationIndex: 0
@@ -68,8 +67,7 @@ FocusScope {
6867 }
6968
7069 function resetSearch() {
71− if(pageHeaderLoader.item && showPageHeader)
72− pageHeaderLoader.item.resetSearch()
70+ categoryView.pageHeader.resetSearch()
7371 }
7472
7573 property var maybePreviewResult;
@@ -139,24 +137,22 @@ FocusScope {
139137 if (!holdingList || !holdingList.moving) {
140138 wasCurrentOnMoveStart = scopeView.isCurrent;
141139 }
142− if (pageHeaderLoader.item && showPageHeader) {
143− pageHeaderLoader.item.resetSearch();
144− }
140+ categoryView.pageHeader.resetSearch();
145141 subPageLoader.closeSubPage();
146142 }
147143
148144 Binding {
149145 target: scopeView.scope
150146 property: "searchQuery"
151− value: pageHeaderLoader.item ? pageHeaderLoader.item.searchQuery : ""
152− when: isCurrent && showPageHeader
147+ value: categoryView.pageHeader.searchQuery
148+ when: isCurrent
153149 }
154150
155151 Binding {
156− target: pageHeaderLoader.item
152+ target: categoryView.pageHeader
157153 property: "searchQuery"
158154 value: scopeView.scope ? scopeView.scope.searchQuery : ""
159− when: isCurrent && showPageHeader
155+ when: isCurrent
160156 }
161157
162158 Connections {
@@ -211,8 +207,8 @@ FocusScope {
211207 property string expandedCategoryId: ""
212208 property int runMaximizeAfterSizeChanges: 0
213209
214− readonly property bool pageHeaderTotallyVisible: scopeView.showPageHeader &&
215− ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == pageHeaderLoader.item.height))
210+ readonly property bool pageHeaderTotallyVisible:
211+ ((headerItemShownHeight == 0 && categoryView.contentY <= categoryView.originY) || (headerItemShownHeight == categoryView.pageHeader.height))
216212
217213 onExpandedCategoryIdChanged: {
218214 var firstCreated = firstCreatedIndex();
@@ -617,41 +613,32 @@ FocusScope {
617613 }
618614 }
619615
620− pageHeader: scopeView.showPageHeader ? pageHeaderLoader : null
621− Loader {
622− id: pageHeaderLoader
616+ pageHeader: PageHeader {
617+ objectName: "scopePageHeader"
623618 width: parent.width
624− sourceComponent: scopeView.showPageHeader ? pageHeaderComponent : undefined
625− Component {
626− id: pageHeaderComponent
627− PageHeader {
628− objectName: "scopePageHeader"
629− width: parent.width
630− title: scopeView.scope ? scopeView.scope.name : ""
631− searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.ctr("Label: Hint for dash search line edit", "Search")
632− showBackButton: scopeView.hasBackAction
633− searchEntryEnabled: true
634− settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
635− favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
636− favorite: scopeView.scope && scopeView.scope.favorite
637− scopeStyle: scopeView.scopeStyle
638− paginationCount: scopeView.paginationCount
639− paginationIndex: scopeView.paginationIndex
640−
641− bottomItem: DashNavigation {
642− scope: scopeView.scope
643− anchors { left: parent.left; right: parent.right }
644− windowHeight: scopeView.height
645− windowWidth: scopeView.width
646− scopeStyle: scopeView.scopeStyle
647− }
648−
649− onBackClicked: scopeView.backClicked()
650− onSettingsClicked: subPageLoader.openSubPage("settings")
651− onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
652− onSearchTextFieldFocused: scopeView.showHeader()
653− }
619+ title: scopeView.scope ? scopeView.scope.name : ""
620+ searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.ctr("Label: Hint for dash search line edit", "Search")
621+ showBackButton: scopeView.hasBackAction
622+ searchEntryEnabled: true
623+ settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
624+ favoriteEnabled: scopeView.scope && scopeView.scope.id !== "clickscope"
625+ favorite: scopeView.scope && scopeView.scope.favorite
626+ scopeStyle: scopeView.scopeStyle
627+ paginationCount: scopeView.paginationCount
628+ paginationIndex: scopeView.paginationIndex
629+
630+ bottomItem: DashNavigation {
631+ scope: scopeView.scope
632+ anchors { left: parent.left; right: parent.right }
633+ windowHeight: scopeView.height
634+ windowWidth: scopeView.width
635+ scopeStyle: scopeView.scopeStyle
654636 }
637+
638+ onBackClicked: scopeView.backClicked()
639+ onSettingsClicked: subPageLoader.openSubPage("settings")
640+ onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
641+ onSearchTextFieldFocused: scopeView.showHeader()
655642 }
656643 }
657644
@@ -660,7 +647,7 @@ FocusScope {
660647 anchors.left: parent.left
661648 anchors.right: parent.right
662649 anchors.bottom: parent.bottom
663− height: parent.height - pullToRefresh.contentY + (pageHeaderLoader.item ? pageHeaderLoader.item.bottomItem[0].height - pageHeaderLoader.item.height : 0)
650+ height: parent.height - pullToRefresh.contentY + (categoryView.pageHeader.bottomItem[0].height - categoryView.pageHeader.height)
664651 clip: true
665652
666653 PullToRefresh {
@@ -801,7 +788,7 @@ FocusScope {
801788 open = true;
802789 }
803790
804− onOpenChanged: pageHeaderLoader.item.unfocus()
791+ onOpenChanged: categoryView.pageHeader.unfocus()
805792
806793 onVisibleChanged: if (!visible) subPage = ""
807794