Merge lp:~mzanetti/unity/phablet-hide-static-apps-while-search into lp:unity/phablet

Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 613
Proposed branch: lp:~mzanetti/unity/phablet-hide-static-apps-while-search
Merge into: lp:unity/phablet
Diff against target: 19 lines (+6/-3)
1 file modified
Dash/DashApps.qml (+6/-3)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet-hide-static-apps-while-search
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+159857@code.launchpad.net

Commit message

hide static parts of apps dash while searching for apps

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Dash/DashApps.qml'
--- Dash/DashApps.qml 2013-04-15 14:31:47 +0000
+++ Dash/DashApps.qml 2013-04-19 16:52:31 +0000
@@ -103,9 +103,12 @@
103 model: SortFilterProxyModel {103 model: SortFilterProxyModel {
104 model: categoryListModel104 model: categoryListModel
105 filterRole: 0 // 0 == modelName105 filterRole: 0 // 0 == modelName
106 filterRegExp: (mainStageApplicationsModel.count === 0106 // FIXME: need to use invertMatch here, otherwise the filter won't update correctly
107 && sideStageApplicationModel.count === 0) ? RegExp("RunningApplicationsModel") : RegExp("")107 // if filterRegExp is set before invertMatch. Bug in SortFilterProxyModel?
108 invertMatch: true108 filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0
109 && sideStageApplicationModel.count === 0) ? RegExp("RunningApplicationsModel") : RegExp("")) :
110 RegExp("InstalledApplicationsModel")
111 invertMatch: pageHeader.searchQuery.length == 0
109 }112 }
110113
111 onAtYEndChanged: if (atYEnd) endReached()114 onAtYEndChanged: if (atYEnd) endReached()

Subscribers

People subscribed via source and target branches