git.iko.soy/unity8
on xenial help sign in
Some amendments to the state/transitions.
f784f7bNicolas d'Offay
Components/PageHeader.qml+13−8
compare with xenial
unifiedsplit
@@ -207,25 +207,30 @@ Item {
207 when: scope.searchInProgress && searchField.text !== ""
207 when: scope.searchInProgress && searchField.text !== ""
208 PropertyChanges { target: searchIndicator; running: true; opacity: 1 }
208 PropertyChanges { target: searchIndicator; running: true; opacity: 1 }
209 PropertyChanges { target: primaryImage; opacity: 0 }
209 PropertyChanges { target: primaryImage; opacity: 0 }
210+ },
210− }, State {
211+ State {
211 name: "idle"
212 name: "idle"
213+ when: !scope.searchInProgress || searchField.text === ""
212− PropertyChanges { target: searchIndicator; running: true; opacity: 1 }
214+ PropertyChanges { target: searchIndicator; running: false; opacity: 0 }
213− PropertyChanges { target: primaryImage; opacity: 0 }
215+ PropertyChanges { target: primaryImage; opacity: 1 }
214 }
216 }
215 ]
217 ]
216
218
217 transitions: [
219 transitions: [
218 Transition {
220 Transition {
221+ from: "idle"
219 to: "searching"
222 to: "searching"
220 SequentialAnimation {
223 SequentialAnimation {
221− NumberAnimation { targets: primaryImage; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
224+ NumberAnimation { target: primaryImage; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
222− NumberAnimation { targets: searchIndicator; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
225+ NumberAnimation { target: searchIndicator; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
223 }
226 }
227+ },
224− }, Transition {
228+ Transition {
229+ from: "searching"
225 to: "idle"
230 to: "idle"
226 SequentialAnimation {
231 SequentialAnimation {
227− NumberAnimation { targets: searchIndicator; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
232+ NumberAnimation { target: searchIndicator; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
228− NumberAnimation { targets: primaryImage; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
233+ NumberAnimation { target: primaryImage; property: opacity; duration: UbuntuAnimation.SlowDuration; easing.type: Easing.Linear }
229 }
234 }
230 }
235 }
231 ]
236 ]