1
=== modified file 'Panel/Indicators.qml'
2
--- Panel/Indicators.qml	2013-04-23 10:23:39 +0000
3
+++ Panel/Indicators.qml	2013-05-20 14:15:37 +0000
4
@@ -66,8 +66,6 @@
5
66
        }
66
        }
6
67
    }
67
    }
7
68
68
8
69
    state: "initial"
9
70
10
71
    function handlePress() {
69
    function handlePress() {
11
72
        menuContent.hideAll()
70
        menuContent.hideAll()
12
73
        menuContent.activateContent()
71
        menuContent.activateContent()
13
@@ -267,9 +265,17 @@
14
267
        }
265
        }
15
268
    }
266
    }
16
269
267
20
270
    //FIXME: when 'states' is changed, "state" is reset to the empty string. Need to find
268
    // We start with pinned states. (default pinnedMode: true)
21
271
    //a way to detect this and restore the correct state again.
269
    states: pinnedModeStates
22
272
    states: (pinnedMode) ? pinnedModeStates : offScreenModeStates
270
    // because of dynamic assignment of states, we need to assign state after completion.
23
271
    Component.onCompleted: state = "initial"
24
272
25
273
    // changing states will reset state to "".
26
274
    onPinnedModeChanged: {
27
275
        var last_state = state;
28
276
        states = (pinnedMode) ? pinnedModeStates : offScreenModeStates;
29
277
        state = last_state;
30
278
    }
31
273
279
32
274
    property list<State> offScreenModeStates: [
280
    property list<State> offScreenModeStates: [
33
275
        State {
281
        State {
34
276
282
35
=== modified file 'Panel/Panel.qml'
36
--- Panel/Panel.qml	2013-04-12 08:37:35 +0000
37
+++ Panel/Panel.qml	2013-05-20 14:15:37 +0000
38
@@ -25,7 +25,7 @@
39
25
    property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(40) : shell.width
25
    property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(40) : shell.width
40
26
    property alias indicators: indicatorsMenu
26
    property alias indicators: indicatorsMenu
41
27
    property bool fullscreenMode: false
27
    property bool fullscreenMode: false
43
28
    property alias searchEnabled: search.enabled
28
    property bool searchVisible: true
44
29
29
45
30
    readonly property real separatorLineHeight: leftSeparatorLine.height
30
    readonly property real separatorLineHeight: leftSeparatorLine.height
46
31
    readonly property real __panelMinusSeparatorLineHeight: panelHeight - separatorLineHeight
31
    readonly property real __panelMinusSeparatorLineHeight: panelHeight - separatorLineHeight
47
@@ -115,16 +115,6 @@
48
115
        pinnedMode: !fullscreenMode
115
        pinnedMode: !fullscreenMode
49
116
116
50
117
        property real unitProgress: (indicatorRevealer.closedValue - progress) / (indicatorRevealer.closedValue - indicatorRevealer.openedValue)
117
        property real unitProgress: (indicatorRevealer.closedValue - progress) / (indicatorRevealer.closedValue - indicatorRevealer.openedValue)
51
118
52
119
        onStateChanged: {
53
120
            if (parent.width < indicatorsMenu.width + search.width) {
54
121
                if (state != "initial") {
55
122
                    search.hideUp()
56
123
                    return;
57
124
                }
58
125
            }
59
126
            search.show()
60
127
        }
61
128
    }
118
    }
62
129
119
63
130
    PanelSeparatorLine {
120
    PanelSeparatorLine {
64
@@ -172,6 +162,20 @@
65
172
    SearchIndicator {
162
    SearchIndicator {
66
173
        id: search
163
        id: search
67
174
        objectName: "search"
164
        objectName: "search"
68
165
        enabled: root.searchVisible
69
166
70
167
        state: {
71
168
            if (parent.width < indicatorsMenu.width + width) {
72
169
                if (indicatorsMenu.state != "initial") {
73
170
                    return "hiddenUp";
74
171
                }
75
172
            }
76
173
            if (root.searchVisible) {
77
174
                return "visible";
78
175
            }
79
176
80
177
            return "hiddenUp";
81
178
        }
82
175
179
83
176
        width: units.gu(13)
180
        width: units.gu(13)
84
177
        height: __panelMinusSeparatorLineHeight
181
        height: __panelMinusSeparatorLineHeight
85
178
182
86
=== modified file 'Panel/SearchIndicator.qml'
87
--- Panel/SearchIndicator.qml	2013-04-08 15:36:12 +0000
88
+++ Panel/SearchIndicator.qml	2013-05-20 14:15:37 +0000
89
@@ -27,14 +27,6 @@
90
27
27
91
28
    signal clicked
28
    signal clicked
92
29
29
93
30
    function show() {
94
31
        search.state = "visible"
95
32
    }
96
33
97
34
    function hideUp() {
98
35
        search.state = "hiddenUp"
99
36
    }
100
37
101
38
    // eater
30
    // eater
102
39
    MouseArea {
31
    MouseArea {
103
40
        anchors.fill: parent
32
        anchors.fill: parent
104
41
33
105
=== modified file 'Shell.qml'
106
--- Shell.qml	2013-05-17 11:00:27 +0000
107
+++ Shell.qml	2013-05-20 14:15:37 +0000
108
@@ -383,10 +383,9 @@
109
383
            indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
383
            indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
110
384
            indicators {
384
            indicators {
111
385
                hides: [launcher]
385
                hides: [launcher]
112
386
                available: !greeter.shown
113
387
            }
386
            }
114
388
            fullscreenMode: shell.fullscreenMode
387
            fullscreenMode: shell.fullscreenMode
116
389
            searchEnabled: !greeter.shown
388
            searchVisible: !greeter.shown
117
390
389
118
391
            InputFilterArea {
390
            InputFilterArea {
119
392
                anchors.fill: parent
391
                anchors.fill: parent
120
393
392
121
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
122
--- tests/qmltests/Panel/tst_Panel.qml	2013-04-17 13:01:10 +0000
123
+++ tests/qmltests/Panel/tst_Panel.qml	2013-05-20 14:15:37 +0000
124
@@ -235,9 +235,9 @@
125
235
            }
235
            }
126
236
        }
236
        }
127
237
237
129
238
        function test_search_click_when_enabled() {
238
        function test_search_click_when_visible() {
130
239
            panel.fullscreenMode = false;
239
            panel.fullscreenMode = false;
132
240
            panel.searchEnabled = true;
240
            panel.searchVisible = true;
133
241
241
134
242
            var search_indicator = findChild(panel, "search");
242
            var search_indicator = findChild(panel, "search");
135
243
            verify(search_indicator != undefined);
243
            verify(search_indicator != undefined);
136
@@ -249,9 +249,9 @@
137
249
            compare(search_clicked, true, "Clicking search indicator while it was enabled did not emit searchClicked signal")
249
            compare(search_clicked, true, "Clicking search indicator while it was enabled did not emit searchClicked signal")
138
250
        }
250
        }
139
251
251
141
252
        function test_search_click_when_disabled() {
252
        function test_search_click_when_not_visible() {
142
253
            panel.fullscreenMode = false;
253
            panel.fullscreenMode = false;
144
254
            panel.searchEnabled = false
254
            panel.searchVisible = false
145
255
255
146
256
            var search_indicator = findChild(panel, "search");
256
            var search_indicator = findChild(panel, "search");
147
257
            verify(search_indicator != undefined);
257
            verify(search_indicator != undefined);
148
@@ -260,7 +260,7 @@
149
260
                       1, 1,
260
                       1, 1,
150
261
                       Qt.LeftButton, Qt.NoModifier , 0);
261
                       Qt.LeftButton, Qt.NoModifier , 0);
151
262
262
153
263
            compare(search_clicked, false, "Clicking search indicator while it was enabled emitted searchClicked signal")
263
            compare(search_clicked, false, "Clicking search indicator while it was not visible emitted searchClicked signal")
154
264
        }
264
        }
155
265
    }
265
    }
156
266
}
266
}
157
267
267
158
=== modified file 'tests/qmltests/Panel/tst_SearchIndicator.qml'
159
--- tests/qmltests/Panel/tst_SearchIndicator.qml	2013-04-17 13:01:10 +0000
160
+++ tests/qmltests/Panel/tst_SearchIndicator.qml	2013-05-20 14:15:37 +0000
161
@@ -49,14 +49,14 @@
162
49
49
163
50
        function test_hideUp() {
50
        function test_hideUp() {
164
51
            var container = findChild(searchIndicator, "container")
51
            var container = findChild(searchIndicator, "container")
166
52
            searchIndicator.hideUp()
52
            searchIndicator.state = "hiddenUp"
167
53
            tryCompare(container, "opacity", 0)
53
            tryCompare(container, "opacity", 0)
168
54
            tryCompare(container, "y", -container.height)
54
            tryCompare(container, "y", -container.height)
169
55
        }
55
        }
170
56
56
171
57
        function test_show() {
57
        function test_show() {
172
58
            var container = findChild(searchIndicator, "container")
58
            var container = findChild(searchIndicator, "container")
174
59
            searchIndicator.show()
59
            searchIndicator.state = "visible"
175
60
            tryCompare(container, "opacity", 1)
60
            tryCompare(container, "opacity", 1)
176
61
            tryCompare(container, "y", 0)
61
            tryCompare(container, "y", 0)
177
62
        }
62
        }
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Approve on 2013-05-23
PS Jenkins bot (community)	continuous-integration		Approve on 2013-05-20
Albert Astals Cid (community)		2013-04-05	Needs Fixing on 2013-04-23
Katie Taylor		2013-04-22	Pending
Review via email: mp+157330@code.launchpad.net