@@ -137,15 +137,11 @@ Item {
137137 }
138138 }
139139
140− Flickable {
140+ Item {
141141 id: headerContainer
142142 objectName: "headerContainer"
143− clip: contentY < height
144143 anchors { left: parent.left; top: parent.top; right: parent.right }
145144 height: header.__styleInstance.contentHeight
146− contentHeight: headersColumn.height
147− interactive: false
148− contentY: showSearch ? 0 : height
149145
150146 property bool showSearch: false
151147
@@ -155,23 +151,42 @@ Item {
155151 style: scopeStyle.headerBackground
156152 }
157153
158− Behavior on contentY {
159− UbuntuNumberAnimation {
154+ Column {
155+ id: headersColumn
156+ anchors {
157+ left: parent.left
158+ right: parent.right
159+ bottom: parent.bottom
160+ }
161+
162+ state: headerContainer.showSearch ? "search" : ""
163+
164+ states: State {
165+ name: "search"
166+
167+ AnchorChanges {
168+ target: headersColumn
169+ anchors.top: parent.top
170+ anchors.bottom: undefined
171+ }
172+ }
173+
174+ transitions: Transition {
160175 id: openSearchAnimation
176+ AnchorAnimation {
177+ duration: UbuntuAnimation.FastDuration
178+ }
179+
161180 property bool openPopup: false
162181
163182 onRunningChanged: {
183+ headerContainer.clip = running;
164184 if (!running && openSearchAnimation.openPopup) {
165185 openSearchAnimation.openPopup = false;
166186 root.openPopup();
167187 }
168188 }
169189 }
170− }
171−
172− Column {
173− id: headersColumn
174− anchors { left: parent.left; right: parent.right }
175190
176191 PageHeader {
177192 id: searchHeader