git.iko.soy/unity8
on xenial help sign in
only submenus select first, not first level menus
commite8793ef7721a44d587f29e65423cac181a399de6 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 2 Mar 2017, 11:45 (10 years ago) parentd34d505
3 files changed+5−1
compare with xenial
unifiedsplit
qml/ApplicationMenus/MenuBar.qml+1 qml/ApplicationMenus/MenuPopup.qml+3−1 tests/qmltests/ApplicationMenus/tst_MenuBar.qml+1
qml/ApplicationMenus/MenuBar.qml+1
@@ -164,6 +164,7 @@ Item {
164164 desiredX: visualItem.x - units.gu(1)
165165 desiredY: parent.height
166166 unityMenuModel: root.unityMenuModel.submenu(visualItem.__ownIndex)
167+ selectFirstOnCountChange: false
167168
168169 Component.onCompleted: reset();
169170 }
qml/ApplicationMenus/MenuPopup.qml+3−1
@@ -33,6 +33,8 @@ UbuntuShape {
3333 // if they don't fit when growing right
3434 property bool substractWidth: false
3535
36+ property bool selectFirstOnCountChange: true
37+
3638 property real desiredX
3739 x: {
3840 var dummy = visible; // force recalc when shown/hidden
@@ -286,7 +288,7 @@ UbuntuShape {
286288 id: repeater
287289
288290 onCountChanged: {
289− if (!d.currentItem && count > 0) {
291+ if (root.selectFirstOnCountChange && !d.currentItem && count > 0) {
290292 root.selectFirstIndex();
291293 }
292294 }
tests/qmltests/ApplicationMenus/tst_MenuBar.qml+1
@@ -280,6 +280,7 @@ Item {
280280 // waits for item to be created so the keyclick actually works
281281 findChild(menuBar, "menuBar-item0-menu-item1-actionItem");
282282
283+ keyClick(Qt.Key_Down);
283284 keyClick(Qt.Key_Down);
284285 keyClick(Qt.Key_Right);
285286