Merge lp:~fboucault/unity-2d/stateful_shortcuts into lp:unity-2d/3.0

[Florian Boucault]

[dash] Shortcuts expanded state are now persistent.

[Olivier Tilloy (osomon)]

This merge request contains a revision that is irrelevant (also submitted as https://code.launchpad.net/~fboucault/unity-2d/improve_launcher_smoothness/+merge/60605), please extract the relevant revision and resubmit.

review: Needs Resubmitting

[Olivier Tilloy (osomon)]

I reviewed the relevant revision (562), and it works as expected and fixes bug #774437.

One tiny remark, could you please update the comment before the declaration of the shortcutsActive property?

    /* Set to true if shortcut buttons are visible */
    - property bool shortcutsActive: false
    + property bool shortcutsActive: true

Since the default value changed from false to true, I’d change the comment to something like "Set to false to hide the shortcuts buttons".

Once this is addressed and the other irrelevant revision is separated, it’s good to merge.

review: Needs Fixing

Unmerged revisions

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-04-18 15:57:01 +0000
+++ launcher/Launcher.qml	2011-05-11 13:10:42 +0000
@@ -63,6 +63,9 @@
             height: (tileSize + itemPadding) * count
             width: parent.width
             itemPadding: 0
+            /* Ensure all delegates are cached in order to improve smoothness of
+               scrolling on very low end platforms */
+            cacheBuffer: 10000
 
             model: ListAggregatorModel {
                 id: shelfItems
 
=== modified file 'places/Home.qml'
--- places/Home.qml	2011-04-11 09:23:01 +0000
+++ places/Home.qml	2011-05-11 13:10:42 +0000
@@ -50,7 +50,7 @@
     }
 
     /* Set to true if shortcut buttons are visible */
-    property bool shortcutsActive: false
+    property bool shortcutsActive: true
 
     /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */
     property bool globalSearchActive: model.entrySearchQuery != ""
 
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-04-08 11:15:39 +0000
+++ places/dash.qml	2011-05-11 13:10:42 +0000
@@ -75,7 +75,6 @@
         /* Take advantage of the fact that the loaded qml is local and setting
            the source loads it immediately making pageLoader.item valid */
         activatePage(pageLoader.item)
-        pageLoader.item.shortcutsActive = true
         dashView.activePlaceEntry = ""
     }