git.iko.soy/unity8
on xenial help sign in
Extra part of the gestures...
a7faf6fAndrea Cimitan
Bottombar/Bottombar.qml+15−13
compare with xenial
unifiedsplit
@@ -56,7 +56,7 @@ Item {
56
56
57 onPreventHidingChanged: {
57 onPreventHidingChanged: {
58 if (!preventHiding) {
58 if (!preventHiding) {
59− if (state == "hint")
59+ if (state == "hint" || state == "reveal")
60 hide()
60 hide()
61 }
61 }
62
62
@@ -132,6 +132,7 @@ Item {
132 property real touchStartX: -1
132 property real touchStartX: -1
133
133
134 readonly property real distanceFromThreshold: (-distance) - distanceThreshold // distance is negative
134 readonly property real distanceFromThreshold: (-distance) - distanceThreshold // distance is negative
135+ readonly property real revealDistance: units.gu(2)
135 readonly property real commitDistance: units.gu(6)
136 readonly property real commitDistance: units.gu(6)
136 readonly property real commitProgress: MathLocal.clamp(distanceFromThreshold / commitDistance, 0, 1)
137 readonly property real commitProgress: MathLocal.clamp(distanceFromThreshold / commitDistance, 0, 1)
137
138
@@ -156,6 +157,8 @@ Item {
156 if (status === DirectionalDragArea.Recognized) {
157 if (status === DirectionalDragArea.Recognized) {
157 if (distanceFromThreshold > commitDistance)
158 if (distanceFromThreshold > commitDistance)
158 bottombar.state = "shown"
159 bottombar.state = "shown"
160+ else if (distanceFromThreshold > revealDistance)
161+ bottombar.state = "reveal"
159 }
162 }
160 }
163 }
161 }
164 }
@@ -186,24 +189,23 @@ Item {
186 states: [
189 states: [
187 State {
190 State {
188 name: "hidden"
191 name: "hidden"
189− PropertyChanges { target: hudButton; opacity: 0}
192+ PropertyChanges { target: hudButton; opacity: 0 }
190− PropertyChanges { target: hudButton; bottomMargin: units.gu(-1)}
193+ PropertyChanges { target: hudButton; bottomMargin: units.gu(-2) }
191 },
194 },
192 State {
195 State {
193 name: "hint"
196 name: "hint"
197+ extend: "hidden"
194− PropertyChanges {
198+ PropertyChanges { target: hudButton; opacity: 0.5 }
195− target: hudButton;
199+ },
196− opacity: 0.5 + 0.5 * dragArea.commitProgress
200+ State {
197− }
201+ name: "reveal"
198− PropertyChanges {
202+ extend: "hint"
199− target: hudButton;
200− bottomMargin: units.gu(-1) + units.gu(1) * dragArea.commitProgress
203+ PropertyChanges { target: hudButton; bottomMargin: units.gu(-2) + units.gu(2) * dragArea.commitProgress }
201− }
202 },
204 },
203 State {
205 State {
204 name: "shown"
206 name: "shown"
205− PropertyChanges { target: hudButton; opacity: 1}
207+ PropertyChanges { target: hudButton; opacity: 1 }
206− PropertyChanges { target: hudButton; bottomMargin: units.gu(0)}
208+ PropertyChanges { target: hudButton; bottomMargin: units.gu(0) }
207 }
209 }
208 ]
210 ]
209}
211}