git.iko.soy/unity8
on xenial help sign in
Changes for HUD 2.0, behaviour...
e858a5aAndrea Cimitan
Bottombar/Bottombar.qml+24−4
compare with xenial
unifiedsplit
@@ -107,20 +107,22 @@ Item {
107 height: distanceThreshold
107 height: distanceThreshold
108 anchors.bottom: parent.bottom
108 anchors.bottom: parent.bottom
109
109
110− distanceThreshold: units.gu(1)
110+ distanceThreshold: units.gu(8)
111 enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground
111 enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground
112 direction: Direction.Upwards
112 direction: Direction.Upwards
113
113
114 property int previousStatus: -1
114 property int previousStatus: -1
115 property real touchStartX: -1
115 property real touchStartX: -1
116
116
117+ readonly property real distanceFromThreshold: Math.max((-distance) - distanceThreshold, 0) // distance is negative
118+ readonly property real commitDistance: units.gu(6)
119+ readonly property real commitProgress: Math.min((distanceFromThreshold - commitDistance) / commitDistance, 1)
120+
117 onStatusChanged: {
121 onStatusChanged: {
118 if (status === DirectionalDragArea.WaitingForTouch) {
122 if (status === DirectionalDragArea.WaitingForTouch) {
119 if (previousStatus == DirectionalDragArea.Recognized) {
123 if (previousStatus == DirectionalDragArea.Recognized) {
120 if (hudButton.mouseOver) {
124 if (hudButton.mouseOver) {
121 hudButton.clicked()
125 hudButton.clicked()
122− } else {
123− bottombar.state = "hidden"
124 }
126 }
125 }
127 }
126 } else if (status === DirectionalDragArea.Undecided) {
128 } else if (status === DirectionalDragArea.Undecided) {
@@ -128,10 +130,17 @@ Item {
128 touchStartX = touchX
130 touchStartX = touchX
129 }
131 }
130 } else if (status === DirectionalDragArea.Recognized) {
132 } else if (status === DirectionalDragArea.Recognized) {
131− bottombar.state = "shown"
133+ bottombar.state = "hint"
132 }
134 }
133 previousStatus = status
135 previousStatus = status
134 }
136 }
137+
138+ onDistanceChanged: {
139+ if (status === DirectionalDragArea.Recognized) {
140+ if (distanceFromThreshold > commitDistance)
141+ bottombar.state = "shown"
142+ }
143+ }
135 }
144 }
136
145
137 MouseArea {
146 MouseArea {
@@ -153,6 +162,17 @@ Item {
153 PropertyChanges { target: hudButton; opacity: 0}
162 PropertyChanges { target: hudButton; opacity: 0}
154 PropertyChanges { target: hudButton; bottomMargin: units.gu(-1)}
163 PropertyChanges { target: hudButton; bottomMargin: units.gu(-1)}
155 },
164 },
165+ State {
166+ name: "hint"
167+ PropertyChanges {
168+ target: hudButton;
169+ opacity: 0.5 + 0.5 * dragArea.commitProgress
170+ }
171+ PropertyChanges {
172+ target: hudButton;
173+ bottomMargin: units.gu(-1) + units.gu(1) * dragArea.commitProgress
174+ }
175+ },
156 State {
176 State {
157 name: "shown"
177 name: "shown"
158 PropertyChanges { target: hudButton; opacity: 1}
178 PropertyChanges { target: hudButton; opacity: 1}