1
=== modified file 'Panel/Indicators.qml'
2
--- Panel/Indicators.qml	2013-10-09 16:36:05 +0000
3
+++ Panel/Indicators.qml	2013-11-06 14:24:39 +0000
4
@@ -38,6 +38,7 @@
5
38
    property bool partiallyOpened: height > panelHeight && !fullyOpened
38
    property bool partiallyOpened: height > panelHeight && !fullyOpened
6
39
    property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
39
    property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
7
40
    property bool contentEnabled: true
40
    property bool contentEnabled: true
8
41
    property bool initalizeItem: true
9
41
    readonly property alias content: menuContent
42
    readonly property alias content: menuContent
10
42
43
11
43
    // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
44
    // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
12
@@ -64,14 +65,13 @@
13
64
    }
65
    }
14
65
66
15
66
    height: panelHeight
67
    height: panelHeight
16
68
    onHeightChanged: updateRevealProgressState(indicators.height - panelHeight, true)
17
67
69
21
68
    onHeightChanged: {
70
    function updateRevealProgressState(revealProgress, enableRelease) {
19
69
        // need to use handle.get_height(). As the handle height depends on indicators.height changes (but this is called first!)
20
70
        var revealProgress = indicators.height - panelHeight
22
71
        if (!showAnimation.running && !hideAnimation.running) {
71
        if (!showAnimation.running && !hideAnimation.running) {
24
72
            if (revealProgress == 0) {
72
            if (revealProgress === 0) {
25
73
                indicators.state = "initial";
73
                indicators.state = "initial";
27
74
            } else if (revealProgress <= hintValue) {
74
            } else if (revealProgress > 0 && revealProgress <= hintValue) {
28
75
                indicators.state = "hint";
75
                indicators.state = "hint";
29
76
            } else if (revealProgress > hintValue && revealProgress < lockThreshold) {
76
            } else if (revealProgress > hintValue && revealProgress < lockThreshold) {
30
77
                indicators.state = "reveal";
77
                indicators.state = "reveal";
31
@@ -80,7 +80,7 @@
32
80
            }
80
            }
33
81
        }
81
        }
34
82
82
36
83
        if (revealProgress == 0) {
83
        if (enableRelease && revealProgress === 0) {
37
84
            menuContent.releaseContent();
84
            menuContent.releaseContent();
38
85
        }
85
        }
39
86
    }
86
    }
40
@@ -107,7 +107,7 @@
41
107
          Vertical velocity check. Don't change the indicator if we're moving too quickly.
107
          Vertical velocity check. Don't change the indicator if we're moving too quickly.
42
108
        */
108
        */
43
109
        var verticalSpeed = Math.abs(yVelocityCalculator.calculate());
109
        var verticalSpeed = Math.abs(yVelocityCalculator.calculate());
45
110
        if (verticalSpeed >= 0.05 && indicatorRow.currentItem!=null) {
110
        if (verticalSpeed >= 0.05 && !initalizeItem) {
46
111
            return;
111
            return;
47
112
        }
112
        }
48
113
113
49
@@ -147,6 +147,7 @@
50
147
        } else if (!currentItem) {
147
        } else if (!currentItem) {
51
148
            indicatorRow.setDefaultItem();
148
            indicatorRow.setDefaultItem();
52
149
        }
149
        }
53
150
        initalizeItem = indicatorRow.currentItem == null;
54
150
    }
151
    }
55
151
152
56
152
    // eater
153
    // eater
57
@@ -282,6 +283,33 @@
58
282
                enableIndexChangeSignal = oldActive;
283
                enableIndexChangeSignal = oldActive;
59
283
            }
284
            }
60
284
        }
285
        }
61
286
62
287
        EdgeDragArea {
63
288
            id: rowDragArea
64
289
            anchors.fill: indicatorRow
65
290
            direction: Direction.Downwards
66
291
            maxSilenceTime: 2000
67
292
            distanceThreshold: 0
68
293
69
294
            enabled: fullyOpened
70
295
            onDraggingChanged: {
71
296
                if (dragging) {
72
297
                    initalizeItem = true;
73
298
                    updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
74
299
                    indicators.calculateCurrentItem(touchX, false);
75
300
                } else {
76
301
                    indicators.state = "commit";
77
302
                }
78
303
            }
79
304
80
305
            onTouchXChanged: {
81
306
                indicators.calculateCurrentItem(touchX, true);
82
307
            }
83
308
            onTouchSceneYChanged: {
84
309
                updateRevealProgressState(Math.max(touchSceneY - panelHeight, hintValue), false);
85
310
                yVelocityCalculator.trackedPosition = touchSceneY;
86
311
            }
87
312
        }
88
285
    }
313
    }
89
286
314
90
287
    Connections {
315
    Connections {
91
@@ -298,7 +326,7 @@
92
298
        onRunningChanged: {
326
        onRunningChanged: {
93
299
            if (hideAnimation.running) {
327
            if (hideAnimation.running) {
94
300
                indicators.state = "initial";
328
                indicators.state = "initial";
96
301
                indicatorRow.currentItem = null;
329
                initalizeItem = true;
97
302
            }
330
            }
98
303
        }
331
        }
99
304
    }
332
    }
100
305
333
101
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
102
--- tests/qmltests/Panel/tst_Panel.qml	2013-08-22 18:37:09 +0000
103
+++ tests/qmltests/Panel/tst_Panel.qml	2013-11-06 14:24:39 +0000
104
@@ -48,9 +48,12 @@
105
48
48
106
49
        function get_window_data() {
49
        function get_window_data() {
107
50
            return [
50
            return [
111
51
            {tag: "pinned", fullscreenFlag: false },
51
                {tag: "pinned", fullscreenFlag: false, alreadyOpen: false },
112
52
            {tag: "fullscreen", fullscreenFlag: true }
52
                {tag: "fullscreen", fullscreenFlag: true, alreadyOpen: false },
113
53
        ]}
53
                {tag: "pinned-alreadyOpen", fullscreenFlag: false, alreadyOpen: true },
114
54
                {tag: "fullscreen-alreadyOpen", fullscreenFlag: true, alreadyOpen: true }
115
55
            ];
116
56
        }
117
54
57
118
55
58
119
56
        function init() {
59
        function init() {
120
@@ -135,6 +138,10 @@
121
135
        // expose more of the panel, binding it to the selected indicator and opening it's menu.
138
        // expose more of the panel, binding it to the selected indicator and opening it's menu.
122
136
        function test_drag_show(data) {
139
        function test_drag_show(data) {
123
137
            panel.fullscreenMode = data.fullscreenFlag;
140
            panel.fullscreenMode = data.fullscreenFlag;
124
141
            if (data.alreadyOpen) {
125
142
                panel.indicators.show();
126
143
                tryCompare(panel.indicators, "fullyOpened", true);
127
144
            }
128
138
145
129
139
            var indicatorRow = findChild(panel.indicators, "indicatorRow");
146
            var indicatorRow = findChild(panel.indicators, "indicatorRow");
130
140
            verify(indicatorRow != undefined);
147
            verify(indicatorRow != undefined);
131
@@ -186,7 +193,9 @@
132
186
                compare(menuContent.currentMenuIndex, i, "Menu conetent should be enabled for item at position " + i);
193
                compare(menuContent.currentMenuIndex, i, "Menu conetent should be enabled for item at position " + i);
133
187
194
134
188
                // init for next indicatorItem
195
                // init for next indicatorItem
136
189
                init();
196
                if (!data.alreadyOpen) {
137
197
                    init();
138
198
                }
139
190
            }
199
            }
140
191
        }
200
        }
141
192
201
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2013-09-20	Approve on 2013-11-13
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-07
Michael Zanetti (community)			Needs Fixing on 2013-10-24
Review via email: mp+186740@code.launchpad.net