git.iko.soy/unity8
on xenial help sign in
Use PageHeader instead Ambiance's PageHeadStyle
b38e0ceMichael Terry
qml/Components/Header.qmldeleted−28
compare with xenial
unifiedsplit
@@ -1,28 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import Ubuntu.Components 1.3
18−import Ubuntu.Components.Themes.Ambiance 1.3
19−
20−PageHeadStyle {
21− // FIXME: Don't use this but PageHeader from Ubuntu.Components 1.3.
22− id: root
23−
24− property var styledItem: root
25− property string title
26− property var config: PageHeadConfiguration {}
27− property var contents: null
28−}
qml/Dash/DashPageHeader.qml+31−36
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.4
17import QtQuick 2.4
18import Ubuntu.Components 1.3
18import Ubuntu.Components 1.3
19−import Ubuntu.Components.Themes.Ambiance 1.3
19+import Ubuntu.Components.Popups 1.3
20import Ubuntu.Components.ListItems 1.3
20import Ubuntu.Components.ListItems 1.3
21import "../Components"
21import "../Components"
22
22
@@ -78,13 +78,13 @@ Item {
78 }
78 }
79 }
79 }
80
80
81− function closePopup(keepFocus) {
81+ function closePopup(keepFocus, keepSearch) {
82 if (extraPanel.visible) {
82 if (extraPanel.visible) {
83 extraPanel.visible = false;
83 extraPanel.visible = false;
84 } else if (!keepFocus) {
84 } else if (!keepFocus) {
85− unfocus();
85+ unfocus(keepSearch);
86 }
86 }
87− if (!searchTextField.text && !root.navigationTag && searchHistory.count == 0) {
87+ if (!keepSearch && !searchTextField.text && !root.navigationTag && searchHistory.count == 0) {
88 headerContainer.showSearch = false;
88 headerContainer.showSearch = false;
89 }
89 }
90 }
90 }
@@ -97,9 +97,9 @@ Item {
97 closePopup(keepFocus);
97 closePopup(keepFocus);
98 }
98 }
99
99
100− function unfocus() {
100+ function unfocus(keepSearch) {
101 searchTextField.focus = false;
101 searchTextField.focus = false;
102− if (!searchTextField.text && !root.navigationTag) {
102+ if (!keepSearch && !searchTextField.text && !root.navigationTag) {
103 headerContainer.showSearch = false;
103 headerContainer.showSearch = false;
104 }
104 }
105 }
105 }
@@ -142,7 +142,7 @@ Item {
142 objectName: "headerContainer"
142 objectName: "headerContainer"
143 clip: contentY < height
143 clip: contentY < height
144 anchors { left: parent.left; top: parent.top; right: parent.right }
144 anchors { left: parent.left; top: parent.top; right: parent.right }
145− height: header.contentHeight
145+ height: header.__styleInstance.contentHeight
146 contentHeight: headersColumn.height
146 contentHeight: headersColumn.height
147 interactive: false
147 interactive: false
148 contentY: showSearch ? 0 : height
148 contentY: showSearch ? 0 : height
@@ -173,22 +173,18 @@ Item {
173 id: headersColumn
173 id: headersColumn
174 anchors { left: parent.left; right: parent.right }
174 anchors { left: parent.left; right: parent.right }
175
175
176− PageHeadStyle {
176+ PageHeader {
177− // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
178 id: searchHeader
177 id: searchHeader
179 anchors { left: parent.left; right: parent.right }
178 anchors { left: parent.left; right: parent.right }
180 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
179 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
181− __separator_visible: false
180+
182− // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
181+ StyleHints {
183− property var styledItem: searchHeader
184− property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
185− property color panelColor: background.topColor
186− panelForegroundColor: config.foregroundColor
187− backgroundColor: "transparent"
188− config: PageHeadConfiguration {
189 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
182 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
183+ backgroundColor: "transparent"
184+ dividerColor: "transparent"
190 }
185 }
186+
191− property var contents: Item {
187+ contents: Item {
192 anchors.fill: parent
188 anchors.fill: parent
193
189
194 TextField {
190 TextField {
@@ -273,7 +269,7 @@ Item {
273 anchors.fill: parent
269 anchors.fill: parent
274 anchors.margins: units.gu(2)
270 anchors.margins: units.gu(2)
275 name: "filters"
271 name: "filters"
276− color: root.activeFiltersCount > 0 ? UbuntuColors.orange : header.config.foregroundColor
272+ color: root.activeFiltersCount > 0 ? UbuntuColors.orange : header.__styleInstance.foregroundColor
277 }
273 }
278
274
279 onClicked: {
275 onClicked: {
@@ -283,6 +279,7 @@ Item {
283
279
284 AbstractButton {
280 AbstractButton {
285 id: cancelButton
281 id: cancelButton
282+ objectName: "cancelButton"
286 width: cancelLabel.width + cancelLabel.anchors.rightMargin + cancelLabel.anchors.leftMargin
283 width: cancelLabel.width + cancelLabel.anchors.rightMargin + cancelLabel.anchors.leftMargin
287 anchors {
284 anchors {
288 top: parent.top
285 top: parent.top
@@ -296,7 +293,7 @@ Item {
296 Label {
293 Label {
297 id: cancelLabel
294 id: cancelLabel
298 text: i18n.tr("Cancel")
295 text: i18n.tr("Cancel")
299− color: header.panelForegroundColor
296+ color: header.__styleInstance.foregroundColor
300 verticalAlignment: Text.AlignVCenter
297 verticalAlignment: Text.AlignVCenter
301 anchors {
298 anchors {
302 verticalCenter: parent.verticalCenter
299 verticalCenter: parent.verticalCenter
@@ -309,28 +306,27 @@ Item {
309 }
306 }
310 }
307 }
311
308
312− PageHeadStyle {
309+ PageHeader {
313− // FIXME: Replace PageHeadStyle from the Ambiance theme by the new PageHeader from Ubuntu.Components 1.3.
314 id: header
310 id: header
315 objectName: "innerPageHeader"
311 objectName: "innerPageHeader"
316 anchors { left: parent.left; right: parent.right }
312 anchors { left: parent.left; right: parent.right }
317 height: headerContainer.height
313 height: headerContainer.height
318 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
314 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
319− __separator_visible: false
315+ title: root.title
320− property var styledItem: header
316+
321− property color dividerColor: "transparent" // Doesn't matter as we don't have PageHeadSections
317+ StyleHints {
322− property color panelColor: background.topColor
323− panelForegroundColor: config.foregroundColor
324− backgroundColor: "transparent"
325− config: PageHeadConfiguration {
326− title: root.title
327 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
318 foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
328− backAction: Action {
319+ backgroundColor: "transparent"
320+ dividerColor: "transparent"
321+ }
322+
323+ leadingActionBar.actions: Action {
329− iconName: backIsClose ? "close" : "back"
324+ iconName: backIsClose ? "close" : "back"
330− visible: root.showBackButton
325+ visible: root.showBackButton
331− onTriggered: root.backClicked()
326+ onTriggered: root.backClicked()
332− }
327+ }
333
328
329+ trailingActionBar {
334 actions: [
330 actions: [
335 Action {
331 Action {
336 objectName: "store"
332 objectName: "store"
@@ -366,7 +362,6 @@ Item {
366 ]
362 ]
367 }
363 }
368
364
369− property var contents: null
370 Component.onCompleted: root.refreshLogo()
365 Component.onCompleted: root.refreshLogo()
371
366
372 Component {
367 Component {
qml/Dash/GenericScopeView.qml+5
@@ -662,6 +662,10 @@ FocusScope {
662 onShowFiltersPopup: { // item
662 onShowFiltersPopup: { // item
663 extraPanel.visible = false;
663 extraPanel.visible = false;
664 scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
664 scopeView.filtersPopover = PopupUtils.open(Qt.resolvedUrl("FiltersPopover.qml"), item, { "contentWidth": scopeView.width - units.gu(2) } );
665+ scopeView.filtersPopover.Component.onDestruction.connect(function () {
666+ categoryView.pageHeader.closePopup(false, true);
667+ categoryView.pageHeader.unfocus(true); // remove the focus from the search field
668+ })
665 }
669 }
666 }
670 }
667
671
@@ -683,6 +687,7 @@ FocusScope {
683 onHistoryItemClicked: {
687 onHistoryItemClicked: {
684 SearchHistoryModel.addQuery(text);
688 SearchHistoryModel.addQuery(text);
685 categoryView.pageHeader.searchQuery = text;
689 categoryView.pageHeader.searchQuery = text;
690+ categoryView.pageHeader.unfocus();
686 }
691 }
687
692
688 onDashNavigationLeafClicked: {
693 onDashNavigationLeafClicked: {
qml/Stages/Splash.qml+6−17
@@ -29,7 +29,7 @@ Item {
29 property color footerColor: d.undefinedColor
29 property color footerColor: d.undefinedColor
30 property alias imageSource: overlaidImage.source
30 property alias imageSource: overlaidImage.source
31 property url icon
31 property url icon
32− property alias title: headerConfig.title
32+ property alias title: header.title
33 property alias showHeader: header.visible
33 property alias showHeader: header.visible
34
34
35 Ambiance.Palette {
35 Ambiance.Palette {
@@ -75,25 +75,14 @@ Item {
75 style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
75 style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
76 }
76 }
77
77
78− Ambiance.PageHeadStyle {
78+ PageHeader {
79− // FIXME: Replace PageHeadStyle by PageHeader from Ubuntu.Components 1.3.
80 id: header
79 id: header
81− anchors {
82− left: parent.left;
83− right: parent.right
80+ anchors { left: parent.left; right: parent.right }
84− }
81+ StyleHints {
85− property var styledItem: header
86− // FIXME Keep in sync with SDK's MainView.qml values of these two colors
87− property color dividerColor: Qt.darker(styledItem.backgroundColor, 1.1)
88− property color panelColor: Qt.lighter(styledItem.backgroundColor, 1.1)
89− panelForegroundColor: config.foregroundColor
90− backgroundColor: "transparent"
91− config: PageHeadConfiguration {
92− id: headerConfig
93 foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
82 foregroundColor: styledItem.fakeTheme.palette.normal.backgroundText
83+ backgroundColor: "transparent"
84+ dividerColor: styledItem.fakeTheme.palette.normal.base
94 }
85 }
95−
96− property var contents: null
97 }
86 }
98
87
99 Image {
88 Image {
tests/qmltests/Dash/tst_Dash.qml+8−8
@@ -192,7 +192,7 @@ Item {
192 // Go back
192 // Go back
193 var scopesList = findChild(dash, "scopesList");
193 var scopesList = findChild(dash, "scopesList");
194 var scopesListPageHeader = findChild(scopesList, "pageHeader");
194 var scopesListPageHeader = findChild(scopesList, "pageHeader");
195− var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "customBackButton");
195+ var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;
196 mouseClick(backButton);
196 mouseClick(backButton);
197 tryCompare(bottomEdgeController, "progress", 0);
197 tryCompare(bottomEdgeController, "progress", 0);
198 }
198 }
@@ -267,7 +267,7 @@ Item {
267
267
268 // Go back
268 // Go back
269 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
269 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
270− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
270+ var backButton = findChild(dashTempScopeItemHeader, "innerPageHeader").leadingActionBar;
271 mouseClick(backButton);
271 mouseClick(backButton);
272
272
273 // Check temp scope is gone
273 // Check temp scope is gone
@@ -293,7 +293,7 @@ Item {
293 // Go back
293 // Go back
294 var scopesList = findChild(dash, "scopesList");
294 var scopesList = findChild(dash, "scopesList");
295 var scopesListPageHeader = findChild(scopesList, "pageHeader");
295 var scopesListPageHeader = findChild(scopesList, "pageHeader");
296− var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "customBackButton");
296+ var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;
297 mouseClick(backButton);
297 mouseClick(backButton);
298 tryCompare(bottomEdgeController, "progress", 0);
298 tryCompare(bottomEdgeController, "progress", 0);
299 }
299 }
@@ -405,7 +405,7 @@ Item {
405 // Exit edit mode and go back
405 // Exit edit mode and go back
406 var scopesList = findChild(dash, "scopesList");
406 var scopesList = findChild(dash, "scopesList");
407 var scopesListPageHeader = findChild(scopesList, "pageHeader");
407 var scopesListPageHeader = findChild(scopesList, "pageHeader");
408− var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "customBackButton");
408+ var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;
409 mouseClick(backButton);
409 mouseClick(backButton);
410 mouseClick(backButton);
410 mouseClick(backButton);
411 tryCompare(bottomEdgeController, "progress", 0);
411 tryCompare(bottomEdgeController, "progress", 0);
@@ -450,7 +450,7 @@ Item {
450 // Exit edit mode
450 // Exit edit mode
451 var scopesList = findChild(dash, "scopesList");
451 var scopesList = findChild(dash, "scopesList");
452 var scopesListPageHeader = findChild(scopesList, "pageHeader");
452 var scopesListPageHeader = findChild(scopesList, "pageHeader");
453− var backButton = findChild(findChild(scopesListPageHeader, "innerPageHeader"), "customBackButton");
453+ var backButton = findChild(scopesListPageHeader, "innerPageHeader").leadingActionBar;
454 mouseClick(backButton);
454 mouseClick(backButton);
455
455
456 // Click on third scope
456 // Click on third scope
@@ -560,7 +560,7 @@ Item {
560
560
561 // Go back
561 // Go back
562 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
562 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
563− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
563+ var backButton = findChild(dashTempScopeItemHeader, "innerPageHeader").leadingActionBar;
564 mouseClick(backButton);
564 mouseClick(backButton);
565
565
566 // Check temp scope is gone
566 // Check temp scope is gone
@@ -628,7 +628,7 @@ Item {
628
628
629 // Go back
629 // Go back
630 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
630 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
631− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
631+ var backButton = findChild(dashTempScopeItemHeader, "innerPageHeader").leadingActionBar;
632 mouseClick(backButton);
632 mouseClick(backButton);
633
633
634 // Check temp scope is gone
634 // Check temp scope is gone
@@ -660,7 +660,7 @@ Item {
660
660
661 // Go back
661 // Go back
662 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
662 var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
663− var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
663+ var backButton = findChild(dashTempScopeItemHeader, "innerPageHeader").leadingActionBar;
664 mouseClick(backButton);
664 mouseClick(backButton);
665
665
666 // Check temp scope is gone
666 // Check temp scope is gone
tests/qmltests/Dash/tst_DashContent.qml+62−3
@@ -215,7 +215,7 @@ Item {
215 verify(pageHeader, "Could not find the scope page header.");
215 verify(pageHeader, "Could not find the scope page header.");
216 var innerHeader = findChild(pageHeader, "innerPageHeader");
216 var innerHeader = findChild(pageHeader, "innerPageHeader");
217 verify(innerHeader, "Could not find the scope page header.");
217 verify(innerHeader, "Could not find the scope page header.");
218− compare(innerHeader.config.title, scopesModel.getScope(data.index).name);
218+ compare(innerHeader.title, scopesModel.getScope(data.index).name);
219 }
219 }
220
220
221 function test_is_active_data() {
221 function test_is_active_data() {
@@ -515,10 +515,18 @@ Item {
515 }
515 }
516
516
517 function test_navigationShowFilterPopup() {
517 function test_navigationShowFilterPopup() {
518− goToSecondLevel();
519−
520 var dashContentList = findChild(dashContent, "dashContentList");
518 var dashContentList = findChild(dashContent, "dashContentList");
519+ var pageHeader = findChild(dashContentList.currentItem, "scopePageHeader")
521 var settingsButton = findChild(dashContentList.currentItem, "settingsButton");
520 var settingsButton = findChild(dashContentList.currentItem, "settingsButton");
521+ var searchButton = findChild(dashContentList.currentItem, "search_button");
522+ var cancelButton = findChild(dashContentList.currentItem, "cancelButton");
523+ var searchTextField = findChild(pageHeader, "searchTextField");
524+ var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
525+ var headerContainer = findChild(pageHeader, "headerContainer");
526+
527+ // test that closing the filters popover without a search unfocuses and removes the navigation
528+ mouseClick(searchButton);
529+ tryCompare(peExtraPanel, "visible", true);
522
530
523 var filtersPopover = findChild(shell, "filtersPopover")
531 var filtersPopover = findChild(shell, "filtersPopover")
524 verify(!filtersPopover);
532 verify(!filtersPopover);
@@ -526,8 +534,33 @@ Item {
526 mouseClick(settingsButton);
534 mouseClick(settingsButton);
527
535
528 filtersPopover = findChild(shell, "filtersPopover")
536 filtersPopover = findChild(shell, "filtersPopover")
537+ verify(filtersPopover);
529
538
539+ mouseClick(shell, shell.width - 1, shell.height - 1);
540+
541+ tryCompare(pageHeader.extraPanel, "visible", false);
542+ tryCompare(headerContainer, "showSearch", true);
543+ tryCompare(searchTextField, "focus", false);
544+
545+ mouseClick(cancelButton);
546+ tryCompare(headerContainer, "showSearch", false);
547+ tryCompare(headerContainer, "contentY", headerContainer.height);
548+
549+ // test within a navigation
550+ goToSecondLevel();
551+
552+ filtersPopover = findChild(shell, "filtersPopover")
553+ verify(!filtersPopover);
554+
555+ mouseClick(settingsButton);
556+
557+ filtersPopover = findChild(shell, "filtersPopover")
530 verify(filtersPopover);
558 verify(filtersPopover);
559+
560+ mouseClick(shell, shell.width - 1, shell.height - 1);
561+
562+ tryCompare(pageHeader.extraPanel, "visible", false);
563+ tryCompare(headerContainer, "showSearch", true);
531 }
564 }
532
565
533 function test_primaryFilter() {
566 function test_primaryFilter() {
@@ -625,5 +658,31 @@ Item {
625 tryCompareFunction(function() { return dashContentList.currentItem.item.scope.id == nextScopeId; }, true);
658 tryCompareFunction(function() { return dashContentList.currentItem.item.scope.id == nextScopeId; }, true);
626 compare(dashContentList.currentIndex, 0);
659 compare(dashContentList.currentIndex, 0);
627 }
660 }
661+
662+ function test_extraPanel() {
663+ var dashContentList = findChild(dashContent, "dashContentList");
664+ var pageHeader = findChild(dashContentList.currentItem, "scopePageHeader")
665+ pageHeader.searchEntryEnabled = true;
666+ pageHeader.searchHistory.clear();
667+
668+ pageHeader.searchHistory.addQuery("Search1");
669+ pageHeader.searchHistory.addQuery("Search2");
670+
671+ pageHeader.triggerSearch();
672+ tryCompare(pageHeader.extraPanel, "visible", true);
673+
674+ var searchTextField = findChild(pageHeader, "searchTextField");
675+ compare(searchTextField.focus, true);
676+
677+ var recentSearches = findChild(pageHeader.extraPanel, "recentSearchesRepeater");
678+ verify(recentSearches, "Could not find recent searches");
679+
680+ waitForRendering(recentSearches);
681+
682+ mouseClick(recentSearches.itemAt(0));
683+ compare(pageHeader.searchQuery, "Search2");
684+ tryCompare(pageHeader.extraPanel, "visible", false);
685+ compare(searchTextField.focus, false);
686+ }
628 }
687 }
629}
688}
tests/qmltests/Dash/tst_DashPageHeader.qml−24
@@ -147,30 +147,6 @@ Item {
147 doResetSearch();
147 doResetSearch();
148 }
148 }
149
149
150− function test_extraPanel() {
151− searchEnabled = true;
152− pageHeader.searchHistory.clear();
153−
154− pageHeader.searchHistory.addQuery("Search1");
155− pageHeader.searchHistory.addQuery("Search2");
156−
157− pageHeader.triggerSearch();
158−
159− tryCompare(pageHeader.extraPanel, "visible", true);
160−
161− var searchTextField = findChild(pageHeader, "searchTextField");
162− compare(searchTextField.focus, true);
163−
164− var recentSearches = findChild(pageHeader.extraPanel, "recentSearchesRepeater");
165− verify(recentSearches, "Could not find recent searches");
166− waitForRendering(recentSearches);
167− mouseClick(recentSearches.itemAt(0));
168−
169− compare(pageHeader.searchQuery, "Search2");
170− tryCompare(pageHeader.extraPanel, "visible", false);
171− compare(searchTextField.focus, false);
172− }
173−
174 function test_popup_closing_data() {
150 function test_popup_closing_data() {
175 return [
151 return [
176 { tag: "with search text", searchText: "foobar", hideSearch: false },
152 { tag: "with search text", searchText: "foobar", hideSearch: false },
tests/qmltests/Dash/tst_GenericScopeView.qml+2−2
@@ -442,8 +442,8 @@ Item {
442
442
443 var innerHeader = findChild(header, "innerPageHeader");
443 var innerHeader = findChild(header, "innerPageHeader");
444 verify(innerHeader, "Could not find the inner header");
444 verify(innerHeader, "Could not find the inner header");
445− verify(Qt.colorEqual(innerHeader.config.foregroundColor, data.foreground),
445+ verify(Qt.colorEqual(innerHeader.__styleInstance.foregroundColor, data.foreground),
446− "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(data.foreground));
446+ "Foreground color not equal: %1 != %2".arg(innerHeader.__styleInstance.foregroundColor).arg(data.foreground));
447
447
448 var background = findChild(header, "headerBackground");
448 var background = findChild(header, "headerBackground");
449 verify(background, "Could not find the background");
449 verify(background, "Could not find the background");
tests/qmltests/Dash/tst_PreviewView.qml+3−3
@@ -98,7 +98,7 @@ Rectangle {
98 var header = findChild(view, "innerPageHeader");
98 var header = findChild(view, "innerPageHeader");
99 verify(header, "Could not find the preview header");
99 verify(header, "Could not find the preview header");
100
100
101− compare(header.config.title, "Mock Scope");
101+ compare(header.title, "Mock Scope");
102 }
102 }
103
103
104 function test_header_style() {
104 function test_header_style() {
@@ -107,8 +107,8 @@ Rectangle {
107
107
108 var innerHeader = findChild(header, "innerPageHeader");
108 var innerHeader = findChild(header, "innerPageHeader");
109 verify(innerHeader, "Could not find the inner header");
109 verify(innerHeader, "Could not find the inner header");
110− verify(Qt.colorEqual(innerHeader.config.foregroundColor, UbuntuColors.darkGrey),
110+ verify(Qt.colorEqual(innerHeader.__styleInstance.foregroundColor, UbuntuColors.darkGrey),
111− "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(UbuntuColors.darkGrey));
111+ "Foreground color not equal: %1 != %2".arg(innerHeader.__styleInstance.foregroundColor).arg(UbuntuColors.darkGrey));
112
112
113 var background = findChild(header, "headerBackground");
113 var background = findChild(header, "headerBackground");
114 verify(background, "Could not find the background");
114 verify(background, "Could not find the background");