git.iko.soy/unity8
on xenial help sign in
["page-header"]["logo"] support
3ef1933Albert Astals
qml/Dash/GenericScopeView.qml+1
compare with xenial
unifiedsplit
@@ -321,6 +321,7 @@ FocusScope {
321 searchInProgress: root.scope.searchInProgress
321 searchInProgress: root.scope.searchInProgress
322 backgroundColor: scopeView.scope && scopeView.scope.customizations["background-color"] || "transparent"
322 backgroundColor: scopeView.scope && scopeView.scope.customizations["background-color"] || "transparent"
323 foregroundColor: scopeView.scope && scopeView.scope.customizations["foreground-color"] || "grey"
323 foregroundColor: scopeView.scope && scopeView.scope.customizations["foreground-color"] || "grey"
324+ imageSource: scopeView.scope && scopeView.scope.customizations["page-header"] && scopeView.scope.customizations["page-header"]["logo"] || ""
324
325
325 bottomItem: DashDepartments {
326 bottomItem: DashDepartments {
326 scope: scopeView.scope
327 scope: scopeView.scope
tests/mocks/Unity/fake_scope.cpp+4
@@ -161,6 +161,10 @@ QVariantMap Scope::customizations() const
161 if (m_id == "clickscope") {
161 if (m_id == "clickscope") {
162 m["background-color"] = "red";
162 m["background-color"] = "red";
163 m["foreground-color"] = "blue";
163 m["foreground-color"] = "blue";
164+ } else if (m_id == "MockScope5") {
165+ QVariantMap pageHeader;
166+ pageHeader["logo"] = "../../tests/qmltests/Components/tst_PageHeader/logo-ubuntu-orange.svg";
167+ m["page-header"] = pageHeader;
164 }
168 }
165 return m;
169 return m;
166}
170}