Unity 8

Merge lp:~nick-dedekind/unity8/lp1226650 into lp:unity8

lp1226650
Merge into trunk

Proposed by Nick Dedekind on 2013-10-16

Status:

Merged

Approved by:

Michał Sawicz on 2013-11-01

Approved revision:

466

Merged at revision:

488

Proposed branch:

lp:~nick-dedekind/unity8/lp1226650

Merge into:

lp:unity8

Diff against target:

61 lines (+27/-6)

1 file modified

plugins/Unity/Indicators/qml/IndicatorPage.qml (+27/-6)

To merge this branch:

bzr merge lp:~nick-dedekind/unity8/lp1226650

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-01
Michael Zanetti (community)		2013-10-16	Approve on 2013-10-21
Review via email: mp+191447@code.launchpad.net

Commit message

Faster loading of indicator menus.

Description of the change

Faster loading of indicator menus.

Changes
=======
Previously the menu model parent node was found by loading it into the listview and parsing the data for the correct type.
This required the loader to be asynchronous due to a binding loop as well as the view to change it's model.

Now we find the parent node by parsing the type of the model stacks tail's first row, and use it's submenu as the listview model.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-16:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1436/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2013-10-21:

lgtm. Very nice speed improvement.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-01:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-11-01:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Nick Dedekind

Unity Team

 === modified file 'plugins/Unity/Indicators/qml/IndicatorPage.qml'
 --- plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-09-30 16:37:55 +0000
 +++ plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-10-16 15:57:58 +0000
@@ -34,11 +34,36 @@
      Indicators.UnityMenuModelStack {
          id: menuStack
          head: contentActive ? main.menuModel : null
++
++        property var rootMenu: null
++
++        onTailChanged: {
++            if (!tail) {
++                rootMenu = null;
++            } else if (rootMenu != tail) {
++                if (tail.get(0, "type") === rootMenuType) {
++                    rootMenu = menuStack.tail.submenu(0);
++                    push(rootMenu, 0);
++                } else {
++                    rootMenu = null;
++                }
++            }
++        }
++    }
++
++    Connections {
++        target: menuStack.tail
++        onRowsInserted: {
++            if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {
++                menuStack.rootMenu = menuStack.tail.submenu(0);
++                menuStack.push(menuStack.rootMenu, 0);
++            }
++        }
+     }
      ListView {
          id: mainMenu
--        model: menuStack.tail ? menuStack.tail : null
++        model: menuStack.rootMenu
          anchors {
              fill: parent
@@ -102,7 +127,7 @@
              Loader {
                  id: loader
--                asynchronous: true
++                asynchronous: false
                  property int modelIndex: index
@@ -114,10 +139,6 @@
                  sourceComponent: factory.load(model)
                  onLoaded: {
--                    if (model.type === rootMenuType) {
--                        menuStack.push(mainMenu.model.submenu(index));
--                    }
--
                      if (item.hasOwnProperty("menuSelected")) {
                          item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });
                          item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });