git.iko.soy/unity8
on xenial help sign in
Move the activity indicator to bottom of GenericScopeView.
commitb3f248d2a7c1cb92cbfd8752a801188b5c20b30f authorMichał Sawicz <michal.sawicz@canonical.com> dateThu 24 Jul 2014, 12:11 (12 years ago) parente125e58
2 files changed+45−15
compare with xenial
unifiedsplit
qml/Components/PageHeader.qml+3−15 qml/Dash/GenericScopeView.qml+42
qml/Components/PageHeader.qml+3−15
@@ -185,25 +185,13 @@ Item {
185185 anchors.fill: parent
186186 anchors.margins: units.gu(.75)
187187 source: "image://theme/clear"
188− opacity: searchTextField.text.length > 0 && !searchActivityIndicator.running
188+ opacity: searchTextField.text.length > 0
189189 visible: opacity > 0
190190 Behavior on opacity {
191191 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
192192 }
193193 }
194194
195− ActivityIndicator {
196− id: searchActivityIndicator
197− objectName: "searchIndicator"
198− anchors.fill: parent
199− anchors.margins: units.gu(.75)
200− running: root.searchInProgress
201− opacity: running ? 1 : 0
202− Behavior on opacity {
203− UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
204− }
205− }
206−
207195 onClicked: {
208196 root.resetSearch(true);
209197 root.openSearchHistory();
@@ -307,7 +295,7 @@ Item {
307295 }
308296 }
309297
310− BorderImage {
298+ Rectangle {
311299 id: bottomBorder
312300 anchors {
313301 top: headerContainer.bottom
@@ -316,7 +304,7 @@ Item {
316304 bottom: bottomContainer.top
317305 }
318306
319− source: "graphics/PageHeaderBaseDivider.sci"
307+ color: "#d7d7d7"
320308 }
321309
322310 Item {
qml/Dash/GenericScopeView.qml+42
@@ -340,6 +340,7 @@ FocusScope {
340340 scopeStyle: scopeView.scopeStyle
341341
342342 bottomItem: DashDepartments {
343+ id: departments
343344 scope: scopeView.scope
344345 width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
345346 anchors.right: parent.right
@@ -367,4 +368,45 @@ FocusScope {
367368 }
368369 }
369370
371+ Rectangle {
372+ id: indicator
373+ anchors {
374+ left: parent.left
375+ right: parent.right
376+ bottom: parent.bottom
377+ }
378+ clip: true
379+ height: units.dp(3)
380+ color: scopeStyle.backgroundLuminance > 0.7 ? "#50000000" : "#50ffffff"
381+ visible: opacity > 0
382+ opacity: scope && scope.searchInProgress && !departments.showList ? 1.0 : 0.0
383+ Behavior on opacity {
384+ UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
385+ }
386+
387+ Rectangle {
388+ id: orange
389+ anchors { top: parent.top; bottom: parent.bottom }
390+ width: parent.width / 4
391+ color: Theme.palette.selected.foreground
392+
393+ SequentialAnimation on x {
394+ running: visible
395+ loops: Animation.Infinite
396+ PropertyAnimation {
397+ from: -orange.width / 2
398+ to: indicator.width - orange.width / 2
399+ duration: UbuntuAnimation.SleepyDuration
400+ easing.type: Easing.InOutSine
401+ }
402+ PropertyAnimation {
403+ from: indicator.width - orange.width / 2
404+ to: -orange.width / 2
405+ duration: UbuntuAnimation.SleepyDuration
406+ easing.type: Easing.InOutSine
407+ }
408+ }
409+ }
410+ }
411+
370412}