git.iko.soy/unity8
on xenial help sign in
Simplify DashApps count/fake models
cbbcda3Albert Astals
qml/Dash/DashApps.qml+1−17
compare with xenial
unifiedsplit
@@ -29,25 +29,9 @@ GenericScopeView {
29 property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
29 property var mainStageApplicationsModel: shell.applicationManager.mainStageApplications
30 property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
30 property var sideStageApplicationModel: shell.applicationManager.sideStageApplications
31
31
32− ListModel {
33− id: dummyVisibilityModifier
34−
35− ListElement { name: "running-apps" }
36− }
37−
38− SortFilterProxyModel {
39− id: runningApplicationsModel
40−
41− model: dummyVisibilityModifier
42− filterRole: 0
43− filterRegExp: invertMatch ? ((mainStageApplicationsModel.count === 0 &&
44− sideStageApplicationModel.count === 0) ? RegExp("running-apps") : RegExp("")) : RegExp("disabled")
45− invertMatch: scopeView.scope.searchQuery.length == 0
46− }
47−
48 QtObject {
32 QtObject {
49 id: countObject
33 id: countObject
50− property int count: runningApplicationsModel.count
34+ property int count: scopeView.scope.searchQuery.length == 0 ? (mainStageApplicationsModel.count + sideStageApplicationModel.count) : 0
51 }
35 }
52
36
53 onScopeChanged: {
37 onScopeChanged: {