@@ -94,10 +94,8 @@ Item {
9494 width: parent.width
9595 height: parent.height
9696
97− Item {
98− id: topBar
99− width: parent.width
100− height: pageHeader.height + (tabBar.opacity == 1 ? tabBar.height + tabBar.anchors.margins : 0)
97+ PageHeader {
98+ id: pageHeader
10199
102100 y: {
103101 if (root.progress < 0.5) {
@@ -106,32 +104,28 @@ Item {
106104 return -height + (root.progress - 0.5) * height * 2;
107105 }
108106 }
107+ width: parent.width
108+ clip: true
109+ title: i18n.tr("Manage Dash")
110+ scopeStyle: root.scopeStyle
111+ showSignatureLine: false
112+ searchEntryEnabled: true
113+ searchInProgress: root.scope ? root.scope.searchInProgress : false
114+ }
109115
110− PageHeader {
111− id: pageHeader
112− width: parent.width
113− clip: true
114− title: i18n.tr("Manage Dash")
115− scopeStyle: root.scopeStyle
116− showSignatureLine: false
117− searchEntryEnabled: true
118− searchInProgress: root.scope ? root.scope.searchInProgress : false
116+ ScopesOverviewTab {
117+ id: tabBar
118+ anchors {
119+ left: parent.left
120+ right: parent.right
121+ top: pageHeader.bottom
122+ margins: units.gu(2)
119123 }
124+ height: units.gu(4)
120125
121− ScopesOverviewTab {
122− id: tabBar
123− anchors {
124− left: parent.left
125− right: parent.right
126− top: pageHeader.bottom
127− margins: units.gu(2)
128− }
129− height: units.gu(4)
130−
131− enabled: opacity == 1
132− opacity: !scope || scope.searchQuery == "" ? 1 : 0
133− Behavior on opacity { UbuntuNumberAnimation {} }
134− }
126+ enabled: opacity == 1
127+ opacity: !scope || scope.searchQuery == "" ? 1 : 0
128+ Behavior on opacity { UbuntuNumberAnimation {} }
135129 }
136130
137131 Repeater {
@@ -144,7 +138,7 @@ Item {
144138 if (index == 0) {
145139 return root.height;
146140 } else {
147− return root.height - topBar.height - units.gu(2)
141+ return root.height - pageHeader.height - tabBar.height - tabBar.anchors.margins - units.gu(2)
148142 }
149143 }
150144 width: {
@@ -240,7 +234,7 @@ Item {
240234 GenericScopeView {
241235 id: searchResultsViewer
242236 anchors {
243− top: topBar.bottom
237+ top: pageHeader.bottom
244238 right: parent.right
245239 left: parent.left
246240 bottom: parent.bottom