git.iko.soy/unity8
on xenial help sign in
topBar was creating more problems than solving
418a208Albert Astals
qml/Dash/ScopesOverview.qml+23−29
compare with xenial
unifiedsplit
@@ -94,10 +94,8 @@ Item {
94 width: parent.width
94 width: parent.width
95 height: parent.height
95 height: parent.height
96
96
97− Item {
97+ PageHeader {
98− id: topBar
98+ id: pageHeader
99− width: parent.width
100− height: pageHeader.height + (tabBar.opacity == 1 ? tabBar.height + tabBar.anchors.margins : 0)
101
99
102 y: {
100 y: {
103 if (root.progress < 0.5) {
101 if (root.progress < 0.5) {
@@ -106,32 +104,28 @@ Item {
106 return -height + (root.progress - 0.5) * height * 2;
104 return -height + (root.progress - 0.5) * height * 2;
107 }
105 }
108 }
106 }
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+ }
109
115
110− PageHeader {
116+ ScopesOverviewTab {
117+ id: tabBar
118+ anchors {
119+ left: parent.left
120+ right: parent.right
111− id: pageHeader
121+ top: pageHeader.bottom
112− width: parent.width
122+ margins: units.gu(2)
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
119 }
123 }
124+ height: units.gu(4)
120
125
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
126+ enabled: opacity == 1
132− opacity: !scope || scope.searchQuery == "" ? 1 : 0
127+ opacity: !scope || scope.searchQuery == "" ? 1 : 0
133− Behavior on opacity { UbuntuNumberAnimation {} }
128+ Behavior on opacity { UbuntuNumberAnimation {} }
134− }
135 }
129 }
136
130
137 Repeater {
131 Repeater {
@@ -144,7 +138,7 @@ Item {
144 if (index == 0) {
138 if (index == 0) {
145 return root.height;
139 return root.height;
146 } else {
140 } else {
147− return root.height - topBar.height - units.gu(2)
141+ return root.height - pageHeader.height - tabBar.height - tabBar.anchors.margins - units.gu(2)
148 }
142 }
149 }
143 }
150 width: {
144 width: {
@@ -240,7 +234,7 @@ Item {
240 GenericScopeView {
234 GenericScopeView {
241 id: searchResultsViewer
235 id: searchResultsViewer
242 anchors {
236 anchors {
243− top: topBar.bottom
237+ top: pageHeader.bottom
244 right: parent.right
238 right: parent.right
245 left: parent.left
239 left: parent.left
246 bottom: parent.bottom
240 bottom: parent.bottom