git.iko.soy/unity8
on xenial help sign in
Fix title in temporary scope pages.
871cf19Michał Sawicz
qml/Dash/DashContent.qml−1
compare with xenial
unifiedsplit
@@ -140,7 +140,6 @@ Item {
140 item.objectName = scope.id
140 item.objectName = scope.id
141 item.scope = Qt.binding(function() { return scope })
141 item.scope = Qt.binding(function() { return scope })
142 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
142 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
143− item.title = Qt.binding(function() { return dashContentList.model.get(index).title; })
144 dashContent.scopeLoaded(item.scope.id)
143 dashContent.scopeLoaded(item.scope.id)
145 }
144 }
146 Connections {
145 Connections {
qml/Dash/GenericScopeView.qml+1−2
@@ -29,7 +29,6 @@ FocusScope {
29 property SortFilterProxyModel categories: categoryFilter
29 property SortFilterProxyModel categories: categoryFilter
30 property bool isCurrent: false
30 property bool isCurrent: false
31 property alias moving: categoryView.moving
31 property alias moving: categoryView.moving
32− property string title
33 property bool hasBackAction: false
32 property bool hasBackAction: false
34 property bool enableHeightBehaviorOnNextCreation: false
33 property bool enableHeightBehaviorOnNextCreation: false
35 property var categoryView: categoryView
34 property var categoryView: categoryView
@@ -320,7 +319,7 @@ FocusScope {
320 pageHeader: PageHeader {
319 pageHeader: PageHeader {
321 id: pageHeader
320 id: pageHeader
322 width: parent.width
321 width: parent.width
323− title: scopeView.title
322+ title: scopeView.scope ? scopeView.scope.name : ""
324 showBackButton: scopeView.hasBackAction
323 showBackButton: scopeView.hasBackAction
325 searchEntryEnabled: true
324 searchEntryEnabled: true
326 searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false
325 searchInProgress: scopeView.scope ? scopeView.scope.searchInProgress : false