@@ -136,7 +136,7 @@ Item {
136 objectName: "headerContainer"
136 objectName: "headerContainer"
137 clip: contentY < height
137 clip: contentY < height
138 anchors { left: parent.left; top: parent.top; right: parent.right }
138 anchors { left: parent.left; top: parent.top; right: parent.right }
139− height: units.gu(6)
139+ height: header.contentHeight
140 contentHeight: headersColumn.height
140 contentHeight: headersColumn.height
141 interactive: false
141 interactive: false
142 contentY: showSearch ? 0 : height
142 contentY: showSearch ? 0 : height
@@ -171,8 +171,6 @@ Item {
171 PageHeadStyle {
171 PageHeadStyle {
172 id: searchHeader
172 id: searchHeader
173 anchors { left: parent.left; right: parent.right }
173 anchors { left: parent.left; right: parent.right }
174− height: headerContainer.height
175− contentHeight: height
176 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
174 opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
177 __separator_visible: false
175 __separator_visible: false
178 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
176 // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
@@ -247,7 +245,6 @@ Item {
247 objectName: "innerPageHeader"
245 objectName: "innerPageHeader"
248 anchors { left: parent.left; right: parent.right }
246 anchors { left: parent.left; right: parent.right }
249 height: headerContainer.height
247 height: headerContainer.height
250− contentHeight: height
251 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
248 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
252 __separator_visible: false
249 __separator_visible: false
253 property var styledItem: header
250 property var styledItem: header