Merge lp:~gcollura/ubuntu-ui-toolkit/fix-1341814-and-1400297 into lp:ubuntu-ui-toolkit

[Giulio Collura]

Fix bug #1341814, bug #1400297. Remove the parent of the previously displayed contents in pagehead.

This is a bugfix for bug #1341814 and bug #1400297. Essentially we have to force the removal of the previous 'contents' item by removing its parent. This way we ensure that the contents are correctly hidden, focused and removed, without destroying them.

[Riccardo Padovani (rpadovani)]

Tested on desktop on vivid, it fixes both bugs.

Thanks Giulio!

review: Approve

[Zoltan Balogh (bzoltan)]

Would you please target this MR to the staging branch? (lp:ubuntu-ui-toolkit/staging)

review: Needs Fixing

Unmerged revisions

1150. By Giulio Collura on 2014-12-29

Fix bug #1341814 and #1400297 by forcing the previous displayed contents to lose their parent

=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2014-10-31 13:36:50 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qml	2014-12-29 17:34:33 +0000
@@ -94,8 +94,19 @@
       See \l PageHeadState for an example that shows how search mode can
       be implemented.
      */
+    property Item __oldContents: null
     property Item contents: null
 
+    onContentsChanged: {
+        if (__oldContents) {
+            // FIX: bug #1341814 and #1400297
+            // We have to force the removal of the previous head.contents
+            // in order to show the new contents
+            __oldContents.parent = null
+        }
+        __oldContents = contents;
+    }
+
     // FIXME: The example below can be much simplified using PageHeadState
     //  when bug #1345775 has been fixed.
     /*!