Merge lp:~aacid/unity8/select_first_submenu_when_it_appears into lp:unity8

[Albert Astals Cid]

Fix real world submenus (e.g. kate) not getting their first item selected on open

MenuBar.qml: remove unused function
MenuPopup.qml: Select first item when one arrives if there's no currentItem instead of on completion
unitymenumodel.cpp: trick rowCount() to simulate "real world late" menus
tst_MenuPopup.qml: adapt to unitymenumodel.cpp changes (and make the Up test actually press Up and not Down)

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~aacid/qmenumodel/batch_insert_remove_from_menu

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Michael Zanetti (mzanetti)]

It does improve the situation but there is something odd:

again, using kate as an example, opening the Tools menu, navigate down to a submenu, enter it, navigate down to the third entry, press left, go to another submenu, enter it. Now the highlight will be at the third entry instead of starting at the first again.

also I managed to get into the situation where I lost keyboard focus altogether in the menu by navigating through the main menu entries. While I'm not 100% sure that is introduced by this branch, I haven't seen it in trunk so far.

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2835
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3177/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4172
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2456
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2456
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4200
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4037/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4037/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4037/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4037/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4037/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4037
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4037/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3177/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2839
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3248/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4265
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2535
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2535
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4293
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4126/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4126/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4126/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4126/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4126/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4126
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4126/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3248/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/select_first_submenu_when_it_appears]

2840. By Albert Astals Cid on 2017-03-02

only submenus select first, not first level menus

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3255/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4279
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2549
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2549
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4307
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4141/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4141/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4141/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4141/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4141/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4141
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4141/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3255/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3257/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4284
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2553
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2553
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4312
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4146/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4146/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4146/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4146/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4146/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4146
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4146/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3257/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3262/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4290
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2557
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2557
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4318
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4152/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4152/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4152/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4152/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4152/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4152
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4152/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3262/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/select_first_submenu_when_it_appears]

2841. By Albert Astals Cid on 2017-03-13

Merge

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3347/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4403
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2640
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2640
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4431
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4264/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4264
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4264/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3347/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3354/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4416
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2648
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2648
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4444
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4277/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4277/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4277/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4277/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4277/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4277
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4277/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3354/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

This works fine for first level submenus; however, very often I found that on second and subsequent levels, most of the time it's the last item that gets preselected. It seems very random, sometimes it's the first one, sometimes the last one.

review: Needs Fixing

[Albert Astals Cid (aacid)]

> This works fine for first level submenus; however, very often I found that on
> second and subsequent levels, most of the time it's the last item that gets
> preselected. It seems very random, sometimes it's the first one, sometimes the
> last one.

Are you sure you're using this with https://code.launchpad.net/~aacid/qmenumodel/batch_insert_remove_from_menu ? Because what you describe sounds like what happens if you do not.

[Lukáš Tinkl (lukas-kde)]

> > This works fine for first level submenus; however, very often I found that
> on
> > second and subsequent levels, most of the time it's the last item that gets
> > preselected. It seems very random, sometimes it's the first one, sometimes
> the
> > last one.
>
> Are you sure you're using this with
> https://code.launchpad.net/~aacid/qmenumodel/batch_insert_remove_from_menu ?
> Because what you describe sounds like what happens if you do not.

Yup, that might explain it (added the MP to the silo as well)

[Lukáš Tinkl (lukas-kde)]

Works fine now, thanks!

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes

review: Approve

=== modified file 'qml/ApplicationMenus/MenuBar.qml'
--- qml/ApplicationMenus/MenuBar.qml	2017-03-08 09:53:21 +0000
+++ qml/ApplicationMenus/MenuBar.qml	2017-03-13 14:11:08 +0000
@@ -44,10 +44,6 @@
     implicitWidth: row.width
     height: parent.height
 
-    function select(index) {
-        d.select(index);
-    }
-
     function dismiss() {
         d.dismissAll();
     }
@@ -137,7 +133,8 @@
                                                                  objectName: visualItem.objectName + "-menu",
                                                                  desiredX: Qt.binding(function() { return visualItem.x - units.gu(1); }),
                                                                  desiredY: Qt.binding(function() { return root.height; }),
-                                                                 unityMenuModel: Qt.binding(function() { return root.unityMenuModel.submenu(visualItem.__ownIndex); })
+                                                                 unityMenuModel: Qt.binding(function() { return root.unityMenuModel.submenu(visualItem.__ownIndex); }),
+                                                                 selectFirstOnCountChange: false
                                                              });
                         __popup.reset();
                         __popup.childActivated.connect(dismiss);

=== modified file 'qml/ApplicationMenus/MenuPopup.qml'
--- qml/ApplicationMenus/MenuPopup.qml	2017-02-22 09:43:50 +0000
+++ qml/ApplicationMenus/MenuPopup.qml	2017-03-13 14:11:08 +0000
@@ -33,6 +33,8 @@
     // if they don't fit when growing right
     property bool substractWidth: false
 
+    property bool selectFirstOnCountChange: true
+
     property real desiredX
     x: {
         var dummy = visible; // force recalc when shown/hidden
@@ -73,8 +75,8 @@
         d.currentItem = null;
     }
 
-    function select(index) {
-        d.select(index)
+    function selectFirstIndex() {
+        d.selectNext(-1);
     }
 
     function reset() {
@@ -325,6 +327,7 @@
                                     });
                                 } else if (popup) {
                                     popup.visible = true;
+                                    popup.item.selectFirstIndex();
                                 }
                             } else {
                                 root.unityMenuModel.activate(__ownIndex);
@@ -358,6 +361,12 @@
                     Repeater {
                         id: repeater
 
+                        onCountChanged: {
+                            if (root.selectFirstOnCountChange && !d.currentItem && count > 0) {
+                                root.selectFirstIndex();
+                            }
+                        }
+
                         Loader {
                             id: loader
                             objectName: root.objectName + "-item" + __ownIndex
@@ -484,9 +493,6 @@
                     target: item
                     onChildActivated: childActivated();
                 }
-
-                Component.onCompleted: item.select(0);
-                onVisibleChanged: if (visible) { item.select(0); }
             }
         }
     }

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2017-01-10 14:46:09 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2017-03-13 14:11:08 +0000
@@ -18,6 +18,8 @@
 
 #include "unitymenumodel.h"
 
+#include <QTimer>
+
 enum MenuRoles {
     LabelRole  = Qt::DisplayRole + 1,
     SensitiveRole,
@@ -35,7 +37,8 @@
 };
 
 UnityMenuModel::UnityMenuModel(QObject *parent)
-:   QAbstractListModel(parent)
+ : QAbstractListModel(parent)
+ , m_rowCountStatus(NoRequestMade)
 {
 }
 
@@ -60,7 +63,7 @@
 
 void UnityMenuModel::insertRow(int row, const QVariant& data)
 {
-    row = qMin(row, rowCount());
+    row = qMin(row, m_modelData.count());
 
     beginInsertRows(QModelIndex(), row, row);
 
@@ -71,12 +74,12 @@
 
 void UnityMenuModel::appendRow(const QVariant& data)
 {
-    insertRow(rowCount(), data);
+    insertRow(m_modelData.count(), data);
 }
 
 void UnityMenuModel::removeRow(int row)
 {
-    if (row < 0 || rowCount() <= row) {
+    if (row < 0 || m_modelData.count() <= row) {
         return;
     }
 
@@ -133,6 +136,22 @@
 
 int UnityMenuModel::rowCount(const QModelIndex&) const
 {
+    // Fake the rowCount to be 0 for a while (100ms)
+    // This emulates menus in real world that don't load immediately
+    if (m_rowCountStatus == TimerRunning)
+        return 0;
+
+    if (m_rowCountStatus == NoRequestMade) {
+        UnityMenuModel *that = const_cast<UnityMenuModel*>(this);
+        that->m_rowCountStatus = TimerRunning;
+        QTimer::singleShot(100, that, [that] {
+            that->beginInsertRows(QModelIndex(), 0, that->m_modelData.count() - 1);
+            that->m_rowCountStatus = TimerFinished;
+            that->endInsertRows();
+        });
+        return 0;
+    }
+
     return m_modelData.count();
 }
 

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.h'
--- tests/mocks/QMenuModel/unitymenumodel.h	2016-09-29 09:15:04 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.h	2017-03-13 14:11:08 +0000
@@ -101,6 +101,13 @@
     QByteArray m_busName;
     QVariantMap m_actions;
     QByteArray m_menuObjectPath;
+
+    enum RowCountStatus {
+        NoRequestMade,
+        TimerRunning,
+        TimerFinished
+    };
+    RowCountStatus m_rowCountStatus;
 };
 
 #endif // MOCK_UNITYMENUMODEL_H

=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuBar.qml'
--- tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-03 10:21:54 +0000
+++ tests/qmltests/ApplicationMenus/tst_MenuBar.qml	2017-03-13 14:11:08 +0000
@@ -271,5 +271,39 @@
                 return false;
             }, true);
         }
+
+        function test_firstDisabled() {
+            var data = appMenuData.generateTestData(10,5,2,3);
+            data[0].submenu[1].submenu[0].rowData.sensitive = false;
+            menuBackend.modelData = data;
+
+            var menuItem = findChild(menuBar, "menuBar-item0");
+            menuItem.show();
+
+            // waits for item to be created so the keyclick actually works
+            findChild(menuBar, "menuBar-item0-menu-item1-actionItem");
+
+            keyClick(Qt.Key_Down);
+            keyClick(Qt.Key_Down);
+            keyClick(Qt.Key_Right);
+
+            var submenu = findChild(menuBar, "menuBar-item0-menu-item1-menu");
+            var priv = findInvisibleChild(submenu, "d");
+            var subActionItem1 = findChild(submenu, "menuBar-item0-menu-item1-menu-item1-actionItem");
+            compare(priv.currentItem.item, subActionItem1);
+
+            keyClick(Qt.Key_Down);
+            var subActionItem3 = findChild(submenu, "menuBar-item0-menu-item1-menu-item3-actionItem");
+            compare(priv.currentItem.item, subActionItem3);
+
+            // now move mouse over to a different item and back to exercise a different codepath
+            var actionItem0 = findChild(menuBar, "menuBar-item0-menu-item0-actionItem");
+            mouseMove(actionItem0, actionItem0.width/2, actionItem0.height/2);
+
+            var actionItem1 = findChild(menuBar, "menuBar-item0-menu-item1-actionItem");
+            mouseMove(actionItem1, actionItem1.width/2, actionItem1.height/2);
+
+            tryCompareFunction(function() { return priv.currentItem.item == subActionItem1; }, true);
+        }
     }
 }

=== modified file 'tests/qmltests/ApplicationMenus/tst_MenuPopup.qml'
--- tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-01-25 14:10:44 +0000
+++ tests/qmltests/ApplicationMenus/tst_MenuPopup.qml	2017-03-13 14:11:08 +0000
@@ -160,9 +160,6 @@
             var priv = findInvisibleChild(menu, "d");
 
             keyClick(Qt.Key_Down, Qt.NoModifier);
-            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
-
-            keyClick(Qt.Key_Down, Qt.NoModifier);
             compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
 
             keyClick(Qt.Key_Down, Qt.NoModifier);
@@ -170,6 +167,9 @@
 
             keyClick(Qt.Key_Down, Qt.NoModifier);
             compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
+
+            keyClick(Qt.Key_Down, Qt.NoModifier);
+            compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
         }
 
         function test_keyboardNavigation_UpKeySelectsAndOpensPreviousMenuItemAndRotates() {
@@ -181,17 +181,17 @@
 
             var priv = findInvisibleChild(menu, "d");
 
-            keyClick(Qt.Key_Down, Qt.NoModifier);
-            compare(priv.currentItem, item0, "CurrentItem should have moved to item 2");
+            keyClick(Qt.Key_Up, Qt.NoModifier);
+            compare(priv.currentItem, item2, "CurrentItem should have moved to item 2");
 
-            keyClick(Qt.Key_Down, Qt.NoModifier);
+            keyClick(Qt.Key_Up, Qt.NoModifier);
             compare(priv.currentItem, item1, "CurrentItem should have moved to item 1");
 
-            keyClick(Qt.Key_Down, Qt.NoModifier);
-            compare(priv.currentItem, item2, "CurrentItem should have moved to item 0");
+            keyClick(Qt.Key_Up, Qt.NoModifier);
+            compare(priv.currentItem, item0, "CurrentItem should have moved to item 0");
 
-            keyClick(Qt.Key_Down, Qt.NoModifier);
-            compare(priv.currentItem, item0, "CurrentItem should have moved to item 2");
+            keyClick(Qt.Key_Up, Qt.NoModifier);
+            compare(priv.currentItem, item2, "CurrentItem should have moved to item 2");
         }
 
         function test_keyboardNavigation_RightKeyEntersSubMenu() {
@@ -217,7 +217,7 @@
 
             var menuItem = findChild(menu, "menu-item0"); verify(menuItem);
             mouseClick(menuItem, menuItem.width/2, menuItem.height/2);
-            tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, true);
+            tryCompareFunction(function() { return menuItem.popup !== null && findInvisibleChild(menuItem.popup, "d").currentItem !== null }, true);
 
             keyClick(Qt.Key_Left, Qt.NoModifier);
             tryCompareFunction(function() { return menuItem.popup !== null && menuItem.popup.visible }, false);
@@ -245,13 +245,16 @@
 
             menu.unityMenuModel.modelData = differentSizesMenu;
 
-            waitForRendering(menu);
+            // Wait for the two items to be there
+            tryCompareFunction(function() { return findChild(menu, "menu-item1") !== null; }, true);
             var longWidth = menu.width;
+
+            // Now pop one item and make sure it's smaller
             differentSizesMenu.pop();
             menu.unityMenuModel.modelData = differentSizesMenu;
 
-            waitForRendering(menu);
-            verify(menu.width < longWidth);
+            tryCompareFunction(function() { return findChild(menu, "menu-item0") !== null; }, true);
+            tryCompareFunction(function() { return menu.width < longWidth; }, true);
         }
 
         function test_minimumWidth() {