1
=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2
--- qml/ApplicationMenus/MenuBar.qml	2017-03-08 09:53:21 +0000
3
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-13 14:11:08 +0000
4
@@ -44,10 +44,6 @@
5
44
    implicitWidth: row.width
44
    implicitWidth: row.width
6
45
    height: parent.height
45
    height: parent.height
7
46
46
8
47
    function select(index) {
9
48
        d.select(index);
10
49
    }
11
50
12
51
    function dismiss() {
47
    function dismiss() {
13
52
        d.dismissAll();
48
        d.dismissAll();
14
53
    }
49
    }
15
@@ -137,7 +133,8 @@
16
137
                                                                 objectName: visualItem.objectName + "-menu",
133
                                                                 objectName: visualItem.objectName + "-menu",
17
138
                                                                 desiredX: Qt.binding(function() { return visualItem.x - units.gu(1); }),
134
                                                                 desiredX: Qt.binding(function() { return visualItem.x - units.gu(1); }),
18
139
                                                                 desiredY: Qt.binding(function() { return root.height; }),
135
                                                                 desiredY: Qt.binding(function() { return root.height; }),
20
140
                                                                 unityMenuModel: Qt.binding(function() { return root.unityMenuModel.submenu(visualItem.__ownIndex); })
136
                                                                 unityMenuModel: Qt.binding(function() { return root.unityMenuModel.submenu(visualItem.__ownIndex); }),
21
137
                                                                 selectFirstOnCountChange: false
22
141
                                                             });
138
                                                             });
23
142
                        __popup.reset();
139
                        __popup.reset();
24
143
                        __popup.childActivated.connect(dismiss);
140
                        __popup.childActivated.connect(dismiss);
25
144
141
26
=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
27
--- qml/ApplicationMenus/MenuPopup.qml	2017-02-22 09:43:50 +0000
28
+++ qml/ApplicationMenus/MenuPopup.qml	2017-03-13 14:11:08 +0000
29
@@ -33,6 +33,8 @@
30
33
    // if they don't fit when growing right
33
    // if they don't fit when growing right
31
34
    property bool substractWidth: false
34
    property bool substractWidth: false
32
35
35
33
36
    property bool selectFirstOnCountChange: true
34
37
35
36
    property real desiredX
38
    property real desiredX
36
37
    x: {
39
    x: {
37
38
        var dummy = visible; // force recalc when shown/hidden
40
        var dummy = visible; // force recalc when shown/hidden
38
@@ -73,8 +75,8 @@
39
73
        d.currentItem = null;
75
        d.currentItem = null;
40
74
    }
76
    }
41
75
77
44
76
    function select(index) {
78
    function selectFirstIndex() {
45
77
        d.select(index)
79
        d.selectNext(-1);
46
78
    }
80
    }
47
79
81
48
80
    function reset() {
82
    function reset() {
49
@@ -325,6 +327,7 @@
50
325
                                    });
327
                                    });
51
326
                                } else if (popup) {
328
                                } else if (popup) {
52
327
                                    popup.visible = true;
329
                                    popup.visible = true;
53
330
                                    popup.item.selectFirstIndex();
54
328
                                }
331
                                }
55
329
                            } else {
332
                            } else {
56
330
                                root.unityMenuModel.activate(__ownIndex);
333
                                root.unityMenuModel.activate(__ownIndex);
57
@@ -358,6 +361,12 @@
58
358
                    Repeater {
361
                    Repeater {
59
359
                        id: repeater
362
                        id: repeater
60
360
363
61
364
                        onCountChanged: {
62
365
                            if (root.selectFirstOnCountChange && !d.currentItem && count > 0) {
63
366
                                root.selectFirstIndex();
64
367
                            }
65
368
                        }
66
369
67
361
                        Loader {
370
                        Loader {
68
362
                            id: loader
371
                            id: loader
69
363
                            objectName: root.objectName + "-item" + __ownIndex
372
                            objectName: root.objectName + "-item" + __ownIndex
70
@@ -484,9 +493,6 @@
71
484
                    target: item
493
                    target: item
72
485
                    onChildActivated: childActivated();
494
                    onChildActivated: childActivated();
73
486
                }
495
                }
74
487
75
488
                Component.onCompleted: item.select(0);
76
489
                onVisibleChanged: if (visible) { item.select(0); }
77
490
            }
496
            }
78
491
        }
497
        }
79
492
    }
498
    }
80
493
499
81
=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
82
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2017-01-10 14:46:09 +0000
83
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2017-03-13 14:11:08 +0000
84
@@ -18,6 +18,8 @@
85
18
18
86
19
#include "unitymenumodel.h"
19
#include "unitymenumodel.h"
87
20
20
88
21
#include <QTimer>
89
22
90
21
enum MenuRoles {
23
enum MenuRoles {
91
22
    LabelRole  = Qt::DisplayRole + 1,
24
    LabelRole  = Qt::DisplayRole + 1,
92
23
    SensitiveRole,
25
    SensitiveRole,
93
@@ -35,7 +37,8 @@
94
35
};
37
};
95
36
38
96
37
UnityMenuModel::UnityMenuModel(QObject *parent)
39
UnityMenuModel::UnityMenuModel(QObject *parent)
98
38
:   QAbstractListModel(parent)
40
 : QAbstractListModel(parent)
99
41
 , m_rowCountStatus(NoRequestMade)
100
39
{
42
{
101
40
}
43
}
102
41
44
103
@@ -60,7 +63,7 @@
104
60
63
105
61
void UnityMenuModel::insertRow(int row, const QVariant& data)
64
void UnityMenuModel::insertRow(int row, const QVariant& data)
106
62
{
65
{
108
63
    row = qMin(row, rowCount());
66
    row = qMin(row, m_modelData.count());
109
64
67
110
65
    beginInsertRows(QModelIndex(), row, row);
68
    beginInsertRows(QModelIndex(), row, row);
111
66
69
112
@@ -71,12 +74,12 @@
113
71
74
114
72
void UnityMenuModel::appendRow(const QVariant& data)
75
void UnityMenuModel::appendRow(const QVariant& data)
115
73
{
76
{
117
74
    insertRow(rowCount(), data);
77
    insertRow(m_modelData.count(), data);
118
75
}
78
}
119
76
79
120
77
void UnityMenuModel::removeRow(int row)
80
void UnityMenuModel::removeRow(int row)
121
78
{
81
{
123
79
    if (row < 0 || rowCount() <= row) {
82
    if (row < 0 || m_modelData.count() <= row) {
124
80
        return;
83
        return;
125
81
    }
84
    }
126
82
85
127
@@ -133,6 +136,22 @@
128
133
136
129
134
int UnityMenuModel::rowCount(const QModelIndex&) const
137
int UnityMenuModel::rowCount(const QModelIndex&) const
130
135
{
138
{
131
139
    // Fake the rowCount to be 0 for a while (100ms)
132
140
    // This emulates menus in real world that don't load immediately
133
141
    if (m_rowCountStatus == TimerRunning)
134
142
        return 0;
135
143
136
144
    if (m_rowCountStatus == NoRequestMade) {
137
145
        UnityMenuModel *that = const_cast<UnityMenuModel*>(this);
138
146
        that->m_rowCountStatus = TimerRunning;
139
147
        QTimer::singleShot(100, that, [that] {
140
148
            that->beginInsertRows(QModelIndex(), 0, that->m_modelData.count() - 1);
141
149
            that->m_rowCountStatus = TimerFinished;
142
150
            that->endInsertRows();
143
151
        });
144
152
        return 0;
145
153
    }
146
154
147
136
    return m_modelData.count();
155
    return m_modelData.count();
148
137
}
156
}
149
138
157
150
139
158
151
=== modified file 'tests/mocks/QMenuModel/unitymenumodel.h'
152
--- tests/mocks/QMenuModel/unitymenumodel.h	2016-09-29 09:15:04 +0000
153
+++ tests/mocks/QMenuModel/unitymenumodel.h	2017-03-13 14:11:08 +0000
154
@@ -101,6 +101,13 @@
155
101
    QByteArray m_busName;
101
    QByteArray m_busName;
156
102
    QVariantMap m_actions;
102
    QVariantMap m_actions;
157
103
    QByteArray m_menuObjectPath;
103
    QByteArray m_menuObjectPath;
158
104
159
105
    enum RowCountStatus {
160
106
        NoRequestMade,
161
107
        TimerRunning,
162
108
        TimerFinished
163
109
    };
164
110
    RowCountStatus m_rowCountStatus;
165
104
};
111
};
166
105
112
167
106
#endif // MOCK_UNITYMENUMODEL_H
113
#endif // MOCK_UNITYMENUMODEL_H
168
107
114
169
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
170
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-03 10:21:54 +0000
171
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-13 14:11:08 +0000
172
@@ -271,5 +271,39 @@
173
271
                return false;
271
                return false;
174
272
            }, true);
272
            }, true);
175
273
        }
273
        }
176
274
177
275
        function test_firstDisabled() {
178
276
            var data = appMenuData.generateTestData(10,5,2,3);
179
277
            data[0].submenu[1].submenu[0].rowData.sensitive = false;
180
278
            menuBackend.modelData = data;
181
279
182
280
            var menuItem = findChild(menuBar, "menuBar-item0");
183
281
            menuItem.show();
184
282
185
283
            // waits for item to be created so the keyclick actually works
186
284
            findChild(menuBar, "menuBar-item0-menu-item1-actionItem");
187
285
188
286
            keyClick(Qt.Key_Down);
189
287
            keyClick(Qt.Key_Down);
190
288
            keyClick(Qt.Key_Right);
191
289
192
290
            var submenu = findChild(menuBar, "menuBar-item0-menu-item1-menu");
193
291
            var priv = findInvisibleChild(submenu, "d");
194
292
            var subActionItem1 = findChild(submenu, "menuBar-item0-menu-item1-menu-item1-actionItem");
195
293
            compare(priv.currentItem.item, subActionItem1);
196
294
197
295
            keyClick(Qt.Key_Down);
198
296
            var subActionItem3 = findChild(submenu, "menuBar-item0-menu-item1-menu-item3-actionItem");
199
297
            compare(priv.currentItem.item, subActionItem3);
200
298
201
299
            // now move mouse over to a different item and back to exercise a different codepath
202
300
            var actionItem0 = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
203
301
            mouseMove(actionItem0, actionItem0.width/2, actionItem0.height/2);
204
302
205
303
            var actionItem1 = findChild(menuBar, "menuBar-item0-menu-item1-actionItem");
206
304
            mouseMove(actionItem1, actionItem1.width/2, actionItem1.height/2);
207
305
208
306
            tryCompareFunction(function() { return priv.currentItem.item == subActionItem1; }, true);
209
307
        }
210
274
    }
308
    }
211
275
}
309
}
212
276
310
213
=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuPopup.qml'
214
--- tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-01-25 14:10:44 +0000
215
+++ tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-03-13 14:11:08 +0000
216
@@ -160,9 +160,6 @@
217
160
            var priv = findInvisibleChild(menu, "d");
160
            var priv = findInvisibleChild(menu, "d");
218
161
161
219
162
            keyClick(Qt.Key_Down, Qt.NoModifier);
162
            keyClick(Qt.Key_Down, Qt.NoModifier);
220
163
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
221
164
222
165
            keyClick(Qt.Key_Down, Qt.NoModifier);
223
166
            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
163
            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
224
167
164
225
168
            keyClick(Qt.Key_Down, Qt.NoModifier);
165
            keyClick(Qt.Key_Down, Qt.NoModifier);
226
@@ -170,6 +167,9 @@
227
170
167
228
171
            keyClick(Qt.Key_Down, Qt.NoModifier);
168
            keyClick(Qt.Key_Down, Qt.NoModifier);
229
172
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
169
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
230
170
231
171
            keyClick(Qt.Key_Down, Qt.NoModifier);
232
172
            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
233
173
        }
173
        }
234
174
174
235
175
        function test_keyboardNavigation_UpKeySelectsAndOpensPreviousMenuItemAndRotates() {
175
        function test_keyboardNavigation_UpKeySelectsAndOpensPreviousMenuItemAndRotates() {
236
@@ -181,17 +181,17 @@
237
181
181
238
182
            var priv = findInvisibleChild(menu, "d");
182
            var priv = findInvisibleChild(menu, "d");
239
183
183
242
184
            keyClick(Qt.Key_Down, Qt.NoModifier);
184
            keyClick(Qt.Key_Up, Qt.NoModifier);
243
185
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 2");
185
            compare(priv.currentItem, item2, "CurrentItem should have moved to item 2");
244
186
186
246
187
            keyClick(Qt.Key_Down, Qt.NoModifier);
187
            keyClick(Qt.Key_Up, Qt.NoModifier);
247
188
            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
188
            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
248
189
189
251
190
            keyClick(Qt.Key_Down, Qt.NoModifier);
190
            keyClick(Qt.Key_Up, Qt.NoModifier);
252
191
            compare(priv.currentItem, item2, "CurrentItem should have moved to item 0");
191
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
253
192
192
256
193
            keyClick(Qt.Key_Down, Qt.NoModifier);
193
            keyClick(Qt.Key_Up, Qt.NoModifier);
257
194
            compare(priv.currentItem, item0, "CurrentItem should have moved to item 2");
194
            compare(priv.currentItem, item2, "CurrentItem should have moved to item 2");
258
195
        }
195
        }
259
196
196
260
197
        function test_keyboardNavigation_RightKeyEntersSubMenu() {
197
        function test_keyboardNavigation_RightKeyEntersSubMenu() {
261
@@ -217,7 +217,7 @@
262
217
217
263
218
            var menuItem = findChild(menu, "menu-item0"); verify(menuItem);
218
            var menuItem = findChild(menu, "menu-item0"); verify(menuItem);
264
219
            mouseClick(menuItem, menuItem.width/2, menuItem.height/2);
219
            mouseClick(menuItem, menuItem.width/2, menuItem.height/2);
266
220
            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, true);
220
            tryCompareFunction(function() { return menuItem.popup !== null && findInvisibleChild(menuItem.popup, "d").currentItem !== null }, true);
267
221
221
268
222
            keyClick(Qt.Key_Left, Qt.NoModifier);
222
            keyClick(Qt.Key_Left, Qt.NoModifier);
269
223
            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
223
            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
270
@@ -245,13 +245,16 @@
271
245
245
272
246
            menu.unityMenuModel.modelData = differentSizesMenu;
246
            menu.unityMenuModel.modelData = differentSizesMenu;
273
247
247
275
248
            waitForRendering(menu);
248
            // Wait for the two items to be there
276
249
            tryCompareFunction(function() { return findChild(menu, "menu-item1") !== null; }, true);
277
249
            var longWidth = menu.width;
250
            var longWidth = menu.width;
278
251
279
252
            // Now pop one item and make sure it's smaller
280
250
            differentSizesMenu.pop();
253
            differentSizesMenu.pop();
281
251
            menu.unityMenuModel.modelData = differentSizesMenu;
254
            menu.unityMenuModel.modelData = differentSizesMenu;
282
252
255
285
253
            waitForRendering(menu);
256
            tryCompareFunction(function() { return findChild(menu, "menu-item0") !== null; }, true);
286
254
            verify(menu.width < longWidth);
257
            tryCompareFunction(function() { return menu.width < longWidth; }, true);
287
255
        }
258
        }
288
256
259
289
257
        function test_minimumWidth() {
260
        function test_minimumWidth() {
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)			Approve on 2017-03-17
Unity8 CI Bot	continuous-integration	2017-03-01	Approve on 2017-03-13
Michael Zanetti		2017-03-01	Pending
Review via email: mp+318615@code.launchpad.net