git.iko.soy/unity8
on xenial help sign in
No need for actualOffset with animation duration bounding
a7899cdNick Dedekind
qml/Panel/ActiveCallHint.qml+2−14
compare with xenial
unifiedsplit
@@ -115,7 +115,6 @@ Rectangle {
115 property int columnHeight: column1 ? column1.height : 0
115 property int columnHeight: column1 ? column1.height : 0
116
116
117 delegate: contactColumnRow
117 delegate: contactColumnRow
118−
119 model: 2
118 model: 2
120 offset: 0
119 offset: 0
121
120
@@ -126,17 +125,6 @@ Rectangle {
126 }
125 }
127 }
126 }
128
127
129− property real actualOffset: 0
130− property bool offsetGuard: false
131− onActualOffsetChanged: {
132− if (offsetGuard) { return; }
133− offsetGuard = true;
134−
135− offset = actualOffset;
136− if (actualOffset === model) { actualOffset = 0.0; }
137− offsetGuard = false;
138− }
139−
140 Behavior on offset {
128 Behavior on offset {
141 id: offsetBehaviour
129 id: offsetBehaviour
142 SmoothedAnimation {
130 SmoothedAnimation {
@@ -168,13 +156,13 @@ Rectangle {
168 onRunningChanged: {
156 onRunningChanged: {
169 if (running) {
157 if (running) {
170 offsetBehaviour.enabled = false;
158 offsetBehaviour.enabled = false;
171− labelPathView.actualOffset = 0;
159+ labelPathView.offset = 0;
172 offsetBehaviour.enabled = true;
160 offsetBehaviour.enabled = true;
173 }
161 }
174 }
162 }
175
163
176 onTriggered: {
164 onTriggered: {
177− labelPathView.actualOffset = labelPathView.actualOffset + 0.5;
165+ labelPathView.offset = labelPathView.offset + 0.5;
178 }
166 }
179 }
167 }
180
168