Merge lp:~zsombi/ubuntu-ui-toolkit/panel-ima-fix into lp:ubuntu-ui-toolkit

[Zsombor Egri]

[inversemousearea] Default sensing area not set on the proper time.

[Tim Peeters (tpeeters)]

code looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good, and fixes the regression with the browser app.

Ideally there should be a test to guard against similar regressions in the future, but seeing that it’s almost EOD, let’s get this merged, and ensure that the test is added tomorrow.

review: Approve

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-05-24 11:11:31 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-05-29 14:50:39 +0000
@@ -83,6 +83,7 @@
  */
 InverseMouseAreaType::InverseMouseAreaType(QQuickItem *parent) :
     QQuickItem(parent),
+    m_ready(false),
     m_pressed(false),
     m_moved(false),
     m_propagateEvents(false),
@@ -118,6 +119,9 @@
  */
 void InverseMouseAreaType::update()
 {
+    if (!m_ready) {
+        return;
+    }
     // update sensing area
     if (!m_sensingArea)
         m_sensingArea = QuickUtils::instance().rootItem(this);
@@ -125,6 +129,15 @@
         reset();
 }
 
+void InverseMouseAreaType::componentComplete()
+{
+    QQuickItem::componentComplete();
+    // by now the parents shoudl have been resolved so we can look after the
+    // topmost component for the sensingArea in case it has not been set yet
+    m_ready = true;
+    update();
+}
+
 /*!
   \qmlproperty bool InverseMouseArea::pressed
   This property holds whether the acceptedButtons are pressed outside the area or not.
 
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h	2013-04-15 08:39:51 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h	2013-05-29 14:50:39 +0000
@@ -38,6 +38,7 @@
 
 protected:
     bool eventFilter(QObject *obj, QEvent *ev);
+    void componentComplete();
 
 private: // getter/setter
     bool pressed() const;
@@ -76,6 +77,7 @@
     void update();
     
 private:
+    bool m_ready;
     bool m_pressed;
     bool m_moved;
     bool m_propagateEvents;