Merge lp:~zsombi/ubuntu-ui-toolkit/ima-in-window into lp:ubuntu-ui-toolkit

[Zsombor Egri]

InverseMouseArea sensingArea and Popovers' dismissArea works now when included in Window.

[Olivier Tilloy (osomon)]

113 + // get sening area upon parent change

typo: sening

review: Needs Fixing

[Olivier Tilloy (osomon)]

In QuickUtils::rootItem(QObject *object), is it really correct to walk up the parent() hierarchy?
According to http://qt-project.org/doc/qt-5.0/qtquick/qquickitem.html#parent-prop, « The concept of the visual parent differs from that of the QObject parent. An item's visual parent may not necessarily be the same as its object parent. »

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/120/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/120/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

> In QuickUtils::rootItem(QObject *object), is it really correct to walk up the
> parent() hierarchy?
> According to http://qt-project.org/doc/qt-5.0/qtquick/qquickitem.html#parent-
> prop, « The concept of the visual parent differs from that of the QObject
> parent. An item's visual parent may not necessarily be the same as its object
> parent. »

Yes, true, but we don't necessarily have to walk the visual items only, as if we do, the Window won't be listed as a visual item. More, in case we have a Window, we need it's contentItem. And this is the way we can get it.

[lp:~zsombi/ubuntu-ui-toolkit/ima-in-window]

516. By Zsombor Egri on 2013-05-24

typo fixed

[Olivier Tilloy (osomon)]

> Yes, true, but we don't necessarily have to walk the visual items only, as if
> we do, the Window won't be listed as a visual item. More, in case we have a
> Window, we need it's contentItem. And this is the way we can get it.

So what about walking up the hierarchy of (visual) parent items, and when reaching the top level visual item, try to get the non-visual parent and check whether it’s a QQuickWindow?

Also, is QuickUtils::rootItem(…) meant to work for non visual elements? If not, its parameter should be of type QQuickItem*.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/121/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/121/rebuild

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/ima-in-window]

517. By Zsombor Egri on 2013-05-24

traversing visual items

[Zsombor Egri (zsombi)]

> > Yes, true, but we don't necessarily have to walk the visual items only, as
> if
> > we do, the Window won't be listed as a visual item. More, in case we have a
> > Window, we need it's contentItem. And this is the way we can get it.
>
> So what about walking up the hierarchy of (visual) parent items, and when
> reaching the top level visual item, try to get the non-visual parent and check
> whether it’s a QQuickWindow?

Did that in revision 517. The only issue is that we need to check whether the topmost item belongs to the QQuickView, and if it does, return the rootObject() of it instead of the topmost item found.
>
> Also, is QuickUtils::rootItem(…) meant to work for non visual elements? If
> not, its parameter should be of type QQuickItem*.

It must also work for non-visual elements.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:517
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/122
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-raring-armhf-ci/122/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/122/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

please mark rootObject() as \deprecated in its documentation.

review: Needs Fixing

[Tim Peeters (tpeeters)]

What is the reason that we the QuickUtils docs internal only?

[Tim Peeters (tpeeters)]

177 + if (m_rootView && (m_rootView->contentItem() == parentItem)) {
178 + return m_rootView->rootObject();
179 + } else {
180 + return parentItem;
181 + }

when does this else case occur?

[Tim Peeters (tpeeters)]

169 + while (parentItem) {
170 + if (!parentItem->parentItem()) {
...
}

That could be written as
while (parentItem->parentItem() {
parentItem = parentItem->parentItem();
}

// ! parentIem->parentItem()

lookupQuickView();
77 + if (m_rootView && (m_rootView->contentItem() == parentItem)) {
178 + return m_rootView->rootObject();
179 + } else {
180 + return parentItem;
181 + }
182 + }
183 + parentItem = parentItem->parentItem();
184 + }
185 + }
186 + return 0;

[Tim Peeters (tpeeters)]

can the return 0 in the end ever be reached? when?

[Tim Peeters (tpeeters)]

13 === modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
20 + property Item dismissArea: dialog.dismissArea

why is that there?

[Tim Peeters (tpeeters)]

83 var popupObject;
84 if (params !== undefined) {
85 - popupObject = popupComponent.createObject(QuickUtils.rootObject, params);
86 + popupObject = popupComponent.createObject(QuickUtils.rootItem(popup), params);
87 } else {
88 - popupObject = popupComponent.createObject(QuickUtils.rootObject);
89 + popupObject = popupComponent.createObject(QuickUtils.rootItem(popup));
90 }

popup can be a string. I think that will fail. Perhaps you need to use popupComponent here?
Please test this (our old popup demo may be added to tests/resources).

review: Needs Fixing

[Zsombor Egri (zsombi)]

> What is the reason that we the QuickUtils docs internal only?

Because we don't want to make it public.

[Zsombor Egri (zsombi)]

> please mark rootObject() as \deprecated in its documentation.

Fixed in rev.518

[Zsombor Egri (zsombi)]

> 177 + if (m_rootView && (m_rootView->contentItem() == parentItem)) {
> 178 + return m_rootView->rootObject();
> 179 + } else {
> 180 + return parentItem;
> 181 + }
>
>
> when does this else case occur?

Yes, when the IMA is in Window.

[Zsombor Egri (zsombi)]

> can the return 0 in the end ever be reached? when?

Yes, if the object is null.

[Zsombor Egri (zsombi)]

> 13 === modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
> 20 + property Item dismissArea: dialog.dismissArea
>
>
> why is that there?

Because we need that property in the theme file. Previously we were using QuickUtils.rootObject but as from now we have a function to get the same thing (and as QuickUtuls is NOT a public component therefore we shouldn't use it in the theme files), we need the dismissArea to be accessible in theme file.

[Zsombor Egri (zsombi)]

> 169 + while (parentItem) {
> 170 + if (!parentItem->parentItem()) {
> ...
> }
>
> That could be written as
> while (parentItem->parentItem() {
> parentItem = parentItem->parentItem();
> }
>
> // ! parentIem->parentItem()
>
> lookupQuickView();
> 77 + if (m_rootView && (m_rootView->contentItem() == parentItem)) {
> 178 + return m_rootView->rootObject();
> 179 + } else {
> 180 + return parentItem;
> 181 + }
> 182 + }
> 183 + parentItem = parentItem->parentItem();
> 184 + }
> 185 + }
> 186 + return 0;

fixed in rev 519

[lp:~zsombi/ubuntu-ui-toolkit/ima-in-window]

518. By Zsombor Egri on 2013-05-27

rootObject marked as deprecated in documentation

519. By Zsombor Egri on 2013-05-27

loop refined

520. By Zsombor Egri on 2013-05-27

PopupUtils fixed; rootItem() returns application's rootObject when the given object is null

[Zsombor Egri (zsombi)]

> 83 var popupObject;
> 84 if (params !== undefined) {
> 85 - popupObject = popupComponent.createObject(QuickUtils.rootObject,
> params);
> 86 + popupObject =
> popupComponent.createObject(QuickUtils.rootItem(popup), params);
> 87 } else {
> 88 - popupObject = popupComponent.createObject(QuickUtils.rootObject);
> 89 + popupObject =
> popupComponent.createObject(QuickUtils.rootItem(popup));
> 90 }
>
>
> popup can be a string. I think that will fail. Perhaps you need to use
> popupComponent here?
> Please test this (our old popup demo may be added to tests/resources).

Fixed in rev. 520

[Tim Peeters (tpeeters)]

thanks

review: Approve

=== modified file 'CHANGES'
--- CHANGES	2013-05-22 08:54:31 +0000
+++ CHANGES	2013-05-27 09:51:17 +0000
@@ -10,6 +10,7 @@
 API Changes
 ***********
 
+* DEPRECATED IN QuickUtils: property Item rootObject
 * CHANGED IN Toolbar: property bool active TO property bool opened
 * CHANGED IN Toolbar: property bool lock TO property bool locked
 * CHANGED IN ToolbarActions: property bool active TO property bool opened

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2013-05-24 09:12:56 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2013-05-27 09:51:17 +0000
@@ -173,8 +173,9 @@
         property real maxHeight: 3*dialog.height/4
         property real margins
         property real itemSpacing
+        property Item dismissArea: dialog.dismissArea
 
-        height: childrenRect.height
+        height: Math.min(childrenRect.height, dialog.height)
 
         Column {
             id: contentsColumn

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2013-04-25 19:26:02 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2013-05-27 09:51:17 +0000
@@ -52,16 +52,14 @@
       */
     property PropertyAnimation fadingAnimation: PropertyAnimation{duration: 0}
 
-    anchors.fill: parent ? parent : undefined
-
     // without specifying width and height below, some width calculations go wrong in Sheet.
     // I guess popupBase.width is not correctly set initially
     width: parent ? parent.width : undefined
     height: parent ? parent.height : undefined
 
     // copy value of automaticOrientation from root object (typically a MainView)
-    automaticOrientation: QuickUtils.rootObject && QuickUtils.rootObject.automaticOrientation ?
-                          QuickUtils.rootObject.automaticOrientation : false
+    automaticOrientation: stateWrapper.rootItem && stateWrapper.rootItem.automaticOrientation ?
+                          stateWrapper.rootItem.automaticOrientation : false
 
     /*!
       \preliminary
@@ -71,10 +69,10 @@
     */
     function show() {
         if (!dismissArea)
-            dismissArea = QuickUtils.rootObject
+            dismissArea = stateWrapper.rootItem
 
         // Without setting the parent, mapFromItem() breaks in internalPopupUtils.
-        parent = QuickUtils.rootObject;
+        parent = stateWrapper.rootItem;
         stateWrapper.state = 'opened';
     }
 
@@ -161,9 +159,13 @@
     opacity: 0.0
     /*! \internal */
     onVisibleChanged: stateWrapper.state = (visible) ? 'opened' : 'closed'
+    /*! \internal */
+    onParentChanged: stateWrapper.rootItem = QuickUtils.rootItem(popupBase)
+    Component.onCompleted: stateWrapper.rootItem = QuickUtils.rootItem(popupBase);
 
     Item {
         id: stateWrapper
+        property Item rootItem: QuickUtils.rootItem(popupBase)
 
         states: [
             State {

=== modified file 'modules/Ubuntu/Components/Popups/popupUtils.js'
--- modules/Ubuntu/Components/Popups/popupUtils.js	2013-02-21 15:28:30 +0000
+++ modules/Ubuntu/Components/Popups/popupUtils.js	2013-05-27 09:51:17 +0000
@@ -21,32 +21,35 @@
   the popup to be opened. This can be any property defined by the popups and additional
   custom ones defined in derived popups.
 
-  Sheets do not need callers to be specified, however when using non-modal Sheets or
-  Dialogs, it is worth to set the caller when opening Sheets to avoid leaving orphan
-  sheets on the screen.
+  caller parameter must be given when the Sheet or Dialog is specified using url
+  and opened inside a Window component. If not, the Sheet or Dialog will use the
+  application's root item as dismiss area.
   */
 function open(popup, caller, params) {
     var popupComponent = null;
+    var rootObject = null;
     if (popup.createObject) {
         // popup is a component and can create an object
         popupComponent = popup;
+        rootObject = QuickUtils.rootItem(popup);
     } else if (typeof popup === "string") {
         popupComponent = Qt.createComponent(popup);
+        rootObject = (caller !== undefined) ? QuickUtils.rootItem(caller) : QuickUtils.rootItem(null);
     } else {
         print("PopupUtils.open(): "+popup+" is not a component or a link");
-        return;
+        return null;
     }
 
     var popupObject;
     if (params !== undefined) {
-        popupObject = popupComponent.createObject(QuickUtils.rootObject, params);
+        popupObject = popupComponent.createObject(rootObject, params);
     } else {
-        popupObject = popupComponent.createObject(QuickUtils.rootObject);
+        popupObject = popupComponent.createObject(rootObject);
     }
     if (!popupObject) {
         print("PopupUtils.open(): Failed to create the popup object.");
         return;
-    } else if (popupObject.hasOwnProperty("caller"))
+    } else if (popupObject.hasOwnProperty("caller") && caller)
         popupObject.caller = caller;
 
     // if caller is specified, connect its cleanup to the popup's close

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-04-15 08:39:51 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-05-27 09:51:17 +0000
@@ -87,7 +87,7 @@
     m_moved(false),
     m_propagateEvents(false),
     m_acceptedButtons(Qt::LeftButton),
-    m_sensingArea(QuickUtils::instance().rootObject()),
+    m_sensingArea(QuickUtils::instance().rootItem(this)),
     m_event(0)
 {
     setAcceptedMouseButtons(m_acceptedButtons);
@@ -96,8 +96,10 @@
 
     QObject::connect(this, SIGNAL(enabledChanged()), this, SLOT(update()));
 
-    if (!m_sensingArea)
-        QObject::connect(&QuickUtils::instance(), SIGNAL(rootObjectChanged()), this, SLOT(update()));
+    if (!m_sensingArea) {
+        // get sensing area upon parent change
+        QObject::connect(this, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(update()));
+    }
 
     QGuiApplication::instance()->installEventFilter(this);
 }
@@ -118,7 +120,7 @@
 {
     // update sensing area
     if (!m_sensingArea)
-        m_sensingArea = QuickUtils::instance().rootObject();
+        m_sensingArea = QuickUtils::instance().rootItem(this);
     if (!isEnabled() || !isVisible())
         reset();
 }
@@ -263,7 +265,7 @@
 void InverseMouseAreaType::setSensingArea(QQuickItem *sensing)
 {
     if (!sensing)
-        sensing = QuickUtils::instance().rootObject();
+        sensing = QuickUtils::instance().rootItem(this);
     if (sensing != m_sensingArea) {
         m_sensingArea = sensing;
         reset();

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2013-05-24 05:34:28 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2013-05-27 09:51:17 +0000
@@ -24,6 +24,7 @@
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QAbstractProxyModel>
 #include <QtQml/QQmlPropertyMap>
+#include <QtQml/QQmlInfo>
 
 #include <private/qquicktextinput_p.h>
 #include <private/qquicktextedit_p.h>
@@ -71,15 +72,49 @@
 
 /*!
  * \internal
+ * \deprecated
  * Returns the current root object.
  */
 QQuickItem *QuickUtils::rootObject()
 {
+    qmlInfo(this) << "WARNING: QuickUtils.rootObject property is deprecated: Use QuickUtils::rootItem() function instead.";
     if (!m_rootView)
         lookupQuickView();
     return (m_rootView) ? m_rootView->rootObject() : 0;
 }
 
+/*!
+ * \internal
+ * Returns the root item of a given item. In case there is a QQuickWindow (Window)
+ * found in the hierarchy, the function will return the contentItem of the window.
+ */
+QQuickItem *QuickUtils::rootItem(QObject *object)
+{
+    // make sure we have the m_rootView updated
+    lookupQuickView();
+    if (!object) {
+        return (m_rootView) ? m_rootView->rootObject() : 0;
+    }
+
+    QQuickItem *item = qobject_cast<QQuickItem*>(object);
+    // the given object may be a non-visual element (QtObject or QQmlComponent)
+    // therefore those objects' parent object should be considered
+    QQuickItem *parentItem = item ? item->parentItem() : qobject_cast<QQuickItem*>(object->parent());
+    while (parentItem && parentItem->parentItem()) {
+        parentItem = parentItem->parentItem();
+    }
+
+    if (m_rootView && (m_rootView->contentItem() == parentItem)) {
+        // when traversing visual parents of an element from the application,
+        // we reach QQuickView's contentItem, whose size is invalid. Therefore
+        // we need to return the QQuickView's rootObject() instead of the topmost
+        // item found
+        return m_rootView->rootObject();
+    }
+    return parentItem;
+}
+
+
 QString QuickUtils::inputMethodProvider() const
 {
     return QString(getenv("QT_IM_MODULE"));

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2013-04-18 11:29:24 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2013-05-27 09:51:17 +0000
@@ -38,6 +38,7 @@
     }
 
     QQuickItem *rootObject();
+    Q_INVOKABLE QQuickItem *rootItem(QObject *object);
     QString inputMethodProvider() const;
 
     Q_INVOKABLE qreal modelDelegateHeight(QQmlComponent *delegate, const QVariant &model);

=== modified file 'tests/unit/tst_components/tst_inversemousearea.qml'
--- tests/unit/tst_components/tst_inversemousearea.qml	2013-01-15 08:44:48 +0000
+++ tests/unit/tst_components/tst_inversemousearea.qml	2013-05-27 09:51:17 +0000
@@ -96,7 +96,7 @@
         }
 
         function test_0_sensingArea() {
-            compare(ima.sensingArea, QuickUtils.rootObject, "InverseMouseArea senses the root item area");
+            compare(ima.sensingArea, QuickUtils.rootItem(ima), "InverseMouseArea senses the root item area");
             ima.sensingArea = testSensingArea
             compare(ima.sensingArea, testSensingArea, "InverseMouseArea sensing area set to testSensingArea");
         }

=== modified file 'tests/unit/tst_components/tst_quickutils.qml'
--- tests/unit/tst_components/tst_quickutils.qml	2012-12-03 06:10:00 +0000
+++ tests/unit/tst_components/tst_quickutils.qml	2013-05-27 09:51:17 +0000
@@ -19,117 +19,135 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 
-
-TestCase {
-    name: "QuickUtilsAPI"
-
-    function test_modelDelegateHeightForEmptyObjectModelElements()
-    {
-        list.model = emptyModel;
-        list.section.property = "";
-
-        var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-        compare(itemHeight, 0, "itemHeight failure");
-
-
-        for (var i = 0; i < 10; i++) {
-            emptyModel.append({});
-            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-            compare(itemHeight, 50, "itemHeight failure");
-        }
-    }
-
-    function test_modelDelegateHeightForObjectModel()
-    {
-        list.model = objectList;
-        list.section.property = "label";
-
-        var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
-        compare(sectionHeight, 25, "sectionHeight failure");
-
-        var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-        compare(itemHeight, 50, "itemHeight failure");
-    }
-
-    function test_modelDelegateHeightForVariantListModel()
-    {
-        list.model = variantList;
-        list.section.property = "label";
-
-        var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
-        compare(sectionHeight, 25, "sectionHeight failure");
-
-        var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-        compare(itemHeight, 50, "itemHeight failure");
-    }
-
-    function test_modelDelegateHeightForStringListModel()
-    {
-        list.model = stringList;
-        list.section.property = "modelData";
-
-        var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
-        compare(sectionHeight, 25, "sectionHeight failure");
-
-        var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-        compare(itemHeight, 50, "itemHeight failure");
-    }
-
-    function test_modelDelegateHeightForNumericModel()
-    {
-        list.model = 100;
-        list.section.property = "modelData";
-
-        var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
-        compare(sectionHeight, 25, "sectionHeight failure");
-
-        var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
-        compare(itemHeight, 50, "itemHeight failure");
-    }
-
-    property var emptyModel: ListModel {}
-
-    property var objectList: ListModel {
-        ListElement {label: "1"}
-        ListElement {label: "10"}
-        ListElement {label: "100"}
-        ListElement {label: "2"}
-        ListElement {label: "3"}
-        ListElement {label: "4"}
-        ListElement {label: "5"}
-        ListElement {label: "6"}
-        ListElement {label: "7"}
-        ListElement {label: "8"}
-    }
-
-    property var variantList: [
-        {"label": "1"},
-        {"label": "10"},
-        {"label": "100"},
-        {"label": "2"},
-        {"label": "3"},
-        {"label": "4"},
-        {"label": "5"},
-        {"label": "6"},
-        {"label": "7"},
-        {"label": "8"}
-    ]
-
-    property var stringList: ["1", "10", "100", "2", "3", "4", "5", "6", "7", "8", "9"]
-
-    ListView {
-        id: list
-
-        section.criteria: ViewSection.FirstCharacter
-        section.delegate: Header{
-            text: section
-            height: 25
-        }
-
-        delegate: Standard {
-            text: label
-            height: 50
-        }
-    }
-
+Item {
+    id: root
+    width: units.gu(40)
+    height: units.gu(40)
+
+    TestCase {
+        id: test
+        name: "QuickUtilsAPI"
+        when: windowShown
+
+        function test_rootItem()
+        {
+            compare(QuickUtils.rootItem(test) != 0, true, "Root item is not null");
+        }
+
+        function test_className()
+        {
+            compare(QuickUtils.className(test), "TestCase", "className for TestCase");
+            compare(QuickUtils.className(root), "QQuickItem", "className for Item");
+        }
+
+        function test_modelDelegateHeightForEmptyObjectModelElements()
+        {
+            list.model = emptyModel;
+            list.section.property = "";
+
+            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+            compare(itemHeight, 0, "itemHeight failure");
+
+
+            for (var i = 0; i < 10; i++) {
+                emptyModel.append({});
+                var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+                compare(itemHeight, 50, "itemHeight failure");
+            }
+        }
+
+        function test_modelDelegateHeightForObjectModel()
+        {
+            list.model = objectList;
+            list.section.property = "label";
+
+            var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
+            compare(sectionHeight, 25, "sectionHeight failure");
+
+            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+            compare(itemHeight, 50, "itemHeight failure");
+        }
+
+        function test_modelDelegateHeightForVariantListModel()
+        {
+            list.model = variantList;
+            list.section.property = "label";
+
+            var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
+            compare(sectionHeight, 25, "sectionHeight failure");
+
+            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+            compare(itemHeight, 50, "itemHeight failure");
+        }
+
+        function test_modelDelegateHeightForStringListModel()
+        {
+            list.model = stringList;
+            list.section.property = "modelData";
+
+            var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
+            compare(sectionHeight, 25, "sectionHeight failure");
+
+            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+            compare(itemHeight, 50, "itemHeight failure");
+        }
+
+        function test_modelDelegateHeightForNumericModel()
+        {
+            list.model = 100;
+            list.section.property = "modelData";
+
+            var sectionHeight = QuickUtils.modelDelegateHeight(list.section.delegate, list.model);
+            compare(sectionHeight, 25, "sectionHeight failure");
+
+            var itemHeight = QuickUtils.modelDelegateHeight(list.delegate, list.model);
+            compare(itemHeight, 50, "itemHeight failure");
+        }
+
+        property var emptyModel: ListModel {}
+
+        property var objectList: ListModel {
+            ListElement {label: "1"}
+            ListElement {label: "10"}
+            ListElement {label: "100"}
+            ListElement {label: "2"}
+            ListElement {label: "3"}
+            ListElement {label: "4"}
+            ListElement {label: "5"}
+            ListElement {label: "6"}
+            ListElement {label: "7"}
+            ListElement {label: "8"}
+        }
+
+        property var variantList: [
+            {"label": "1"},
+            {"label": "10"},
+            {"label": "100"},
+            {"label": "2"},
+            {"label": "3"},
+            {"label": "4"},
+            {"label": "5"},
+            {"label": "6"},
+            {"label": "7"},
+            {"label": "8"}
+        ]
+
+        property var stringList: ["1", "10", "100", "2", "3", "4", "5", "6", "7", "8", "9"]
+
+        ListView {
+            id: list
+
+            section.criteria: ViewSection.FirstCharacter
+            section.delegate: Header{
+                text: section
+                height: 25
+            }
+
+            delegate: Standard {
+                text: label
+                height: 50
+            }
+        }
+
+    }
 }

=== modified file 'tests/unit/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml'
--- tests/unit/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml	2013-04-15 07:49:30 +0000
+++ tests/unit/tst_inversemousearea/InverseMouseAreaDoNotPropagateEvents.qml	2013-05-27 09:51:17 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 0.1
 
 Item {
+    objectName: "root"
     width: 100
     height: 100
 

=== added file 'tests/unit/tst_inversemousearea/InverseMouseAreaInWindow.qml'
--- tests/unit/tst_inversemousearea/InverseMouseAreaInWindow.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_inversemousearea/InverseMouseAreaInWindow.qml	2013-05-27 09:51:17 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import Ubuntu.Components 0.1
+
+Item{
+    id: root
+    property string log: ""
+
+    Window {
+        objectName: "isawindow"
+        width: units.gu(50)
+        height: units.gu(50)
+
+        Item {
+            id: clickArea
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: parent.top
+            }
+            height: units.gu(10)
+            Label {
+                anchors.centerIn: parent
+                text: "click me"
+            }
+        }
+
+        Rectangle {
+            id: rect
+            color: "red"
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: clickArea.bottom
+                bottom: parent.bottom
+            }
+        }
+
+        InverseMouseArea {
+            objectName: "ima"
+            id: ima
+            anchors.fill: rect
+            onClicked: {
+                root.log = "IMA"
+                rect.color = "green"
+            }
+        }
+    }
+}

=== modified file 'tests/unit/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml'
--- tests/unit/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml	2013-04-15 07:49:30 +0000
+++ tests/unit/tst_inversemousearea/InverseMouseAreaPropagateEvents.qml	2013-05-27 09:51:17 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 0.1
 
 Item {
+    objectName: "root"
     width: 100
     height: 100
 

=== modified file 'tests/unit/tst_inversemousearea/SensingAreaError.qml'
--- tests/unit/tst_inversemousearea/SensingAreaError.qml	2013-05-24 05:01:32 +0000
+++ tests/unit/tst_inversemousearea/SensingAreaError.qml	2013-05-27 09:51:17 +0000
@@ -19,6 +19,7 @@
 
 Item {
     id: root
+    objectName: "root"
     width: units.gu(40)
     height: units.gu(40)
 

=== modified file 'tests/unit/tst_inversemousearea/tst_inversemousearea.pro'
--- tests/unit/tst_inversemousearea/tst_inversemousearea.pro	2013-05-24 05:22:02 +0000
+++ tests/unit/tst_inversemousearea/tst_inversemousearea.pro	2013-05-27 09:51:17 +0000
@@ -5,4 +5,5 @@
 OTHER_FILES += \
     InverseMouseAreaPropagateEvents.qml \
     InverseMouseAreaDoNotPropagateEvents.qml \
-    SensingAreaError.qml
+    SensingAreaError.qml \
+    InverseMouseAreaInWindow.qml

=== modified file 'tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp'
--- tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp	2013-05-24 05:22:02 +0000
+++ tests/unit/tst_inversemousearea/tst_inversemouseareatest.cpp	2013-05-27 09:51:17 +0000
@@ -142,6 +142,17 @@
         QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
     }
 
+    void testCase_InverseMouseAreInWindow()
+    {
+        InverseMouseAreaType *area = testArea("InverseMouseAreaInWindow.qml");
+        QVERIFY(area);
+        quickView->show();
+
+        QTest::mouseClick(quickView, Qt::LeftButton, 0, QPoint(20, 10));
+        QTest::waitForEvents();
+        QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
+    }
+
 };
 
 QTEST_MAIN(tst_InverseMouseAreaTest)

=== modified file 'themes/Ambiance/qmltheme/default.qmltheme'
--- themes/Ambiance/qmltheme/default.qmltheme	2013-05-14 13:33:39 +0000
+++ themes/Ambiance/qmltheme/default.qmltheme	2013-05-27 09:51:17 +0000
@@ -216,7 +216,7 @@
 }
 .dialog .background {
     dim: true;
-    color: QuickUtils.rootObject.width > units.gu(60) ? Qt.rgba(0, 0, 0, 0.6) : Qt.rgba(0, 0, 0, 0.9);
+    color: item.width > units.gu(60) ? Qt.rgba(0, 0, 0, 0.6) : Qt.rgba(0, 0, 0, 0.9);
     opacity: 1.0;
 }
 .dialog .foreground {
@@ -225,7 +225,7 @@
     margins: units.gu(4);
     itemSpacing: units.gu(2);
     radius: "medium";
-    visible: QuickUtils.rootObject.width > units.gu(60);
+    visible: item.dismissArea.width > units.gu(60);
     color: visible ? Qt.rgba(0, 0, 0, 0.7) : "transparent";
 }
 .dialog .foreground .title {