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

Proposed by Florian Boucault
Status: Superseded
Proposed branch: lp:~fboucault/unity-2d/stateful_shortcuts
Merge into: lp:unity-2d/3.0
Diff against target: 37 lines (+4/-2)
3 files modified
launcher/Launcher.qml (+3/-0)
places/Home.qml (+1/-1)
places/dash.qml (+0/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/stateful_shortcuts
Reviewer Review Type Date Requested Status
Olivier Tilloy Needs Fixing
Review via email: mp+60622@code.launchpad.net

This proposal has been superseded by a proposal from 2011-05-19.

Description of the change

[dash] Shortcuts expanded state are now persistent.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

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
Revision history for this message
Olivier Tilloy (osomon) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
63 height: (tileSize + itemPadding) * count63 height: (tileSize + itemPadding) * count
64 width: parent.width64 width: parent.width
65 itemPadding: 065 itemPadding: 0
66 /* Ensure all delegates are cached in order to improve smoothness of
67 scrolling on very low end platforms */
68 cacheBuffer: 10000
6669
67 model: ListAggregatorModel {70 model: ListAggregatorModel {
68 id: shelfItems71 id: shelfItems
6972
=== 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 @@
50 }50 }
5151
52 /* Set to true if shortcut buttons are visible */52 /* Set to true if shortcut buttons are visible */
53 property bool shortcutsActive: false53 property bool shortcutsActive: true
5454
55 /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */55 /* Either globalSearch is shown or buttons are shown depending on globalSearchActive */
56 property bool globalSearchActive: model.entrySearchQuery != ""56 property bool globalSearchActive: model.entrySearchQuery != ""
5757
=== 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 @@
75 /* Take advantage of the fact that the loaded qml is local and setting75 /* Take advantage of the fact that the loaded qml is local and setting
76 the source loads it immediately making pageLoader.item valid */76 the source loads it immediately making pageLoader.item valid */
77 activatePage(pageLoader.item)77 activatePage(pageLoader.item)
78 pageLoader.item.shortcutsActive = true
79 dashView.activePlaceEntry = ""78 dashView.activePlaceEntry = ""
80 }79 }
8180

Subscribers

People subscribed via source and target branches