@@ -37,6 +37,7 @@ Showable {
3737 property bool partiallyOpened: height > panelHeight && !fullyOpened
3838 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
3939 property bool contentEnabled: true
40+ property bool initalizeItem: true
4041 readonly property alias content: menuContent
4142
4243 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
@@ -63,14 +64,13 @@ Showable {
6364 }
6465
6566 height: panelHeight
67+ onHeightChanged: updateRevealProgressState(indicators.height - panelHeight, true)
6668
67− onHeightChanged: {
68− // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)
69− var revealProgress = indicators.height - panelHeight
69+ function updateRevealProgressState(revealProgress, enableRelease) {
7070 if (!showAnimation.running && !hideAnimation.running) {
71− if (revealProgress == 0) {
71+ if (revealProgress === 0) {
7272 indicators.state = "initial";
73− } else if (revealProgress <= hintValue) {
73+ } else if (revealProgress > 0 && revealProgress <= hintValue) {
7474 indicators.state = "hint";
7575 } else if (revealProgress > hintValue && revealProgress < lockThreshold) {
7676 indicators.state = "reveal";
@@ -79,7 +79,7 @@ Showable {
7979 }
8080 }
8181
82− if (revealProgress == 0) {
82+ if (enableRelease && revealProgress === 0) {
8383 menuContent.releaseContent();
8484 }
8585 }
@@ -106,7 +106,7 @@ Showable {
106106 Vertical velocity check. Don't change the indicator if we're moving too quickly.
107107 */
108108 var verticalSpeed = Math.abs(yVelocityCalculator.calculate());
109− if (verticalSpeed >= 0.05 && indicatorRow.currentItem!=null) {
109+ if (verticalSpeed >= 0.05 && !initalizeItem) {
110110 return;
111111 }
112112
@@ -146,6 +146,7 @@ Showable {
146146 } else if (!currentItem) {
147147 indicatorRow.setDefaultItem();
148148 }
149+ initalizeItem = indicatorRow.currentItem == null;
149150 }
150151
151152 // eater
@@ -281,6 +282,33 @@ Showable {
281282 enableIndexChangeSignal = oldActive;
282283 }
283284 }
285+
286+ EdgeDragArea {
287+ id: rowDragArea
288+ anchors.fill: indicatorRow
289+ direction: Direction.Downwards
290+ maxSilenceTime: 2000
291+ distanceThreshold: 0
292+
293+ enabled: fullyOpened
294+ onDraggingChanged: {
295+ if (dragging) {
296+ initalizeItem = true;
297+ updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
298+ indicators.calculateCurrentItem(touchX, false);
299+ } else {
300+ indicators.state = "commit";
301+ }
302+ }
303+
304+ onTouchXChanged: {
305+ indicators.calculateCurrentItem(touchX, true);
306+ }
307+ onTouchSceneYChanged: {
308+ updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
309+ yVelocityCalculator.trackedPosition = touchSceneY;
310+ }
311+ }
284312 }
285313
286314 Connections {
@@ -297,7 +325,7 @@ Showable {
297325 onRunningChanged: {
298326 if (hideAnimation.running) {
299327 indicators.state = "initial";
300− indicatorRow.currentItem = null;
328+ initalizeItem = true;
301329 }
302330 }
303331 }