Merge lp:~zsombi/ubuntu-ui-toolkit/inverseMouseArea-update into lp:~bzoltan/ubuntu-ui-toolkit/landing_04-06

[Zsombor Egri]

Reverting InverseMouseAreaType updateArea() method to update(). Calling shadowed superclass' update() method.

[Tim Peeters (tpeeters)]

that makes sense

review: Approve

[Tim Peeters (tpeeters)]

this makes sense:

17:53:23 < elopio> t1mp: nice! would it be too much to ask for a regression test?
17:53:50 < elopio> otherwise, we might still be suffering with notes erros on the releases.

[Tim Peeters (tpeeters)]

Please fix this bug ;) https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1331606

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-06-09 08:26:24 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-06-18 15:29:40 +0000
@@ -276,7 +276,7 @@
   \internal
   Slot connected to enabledChanged signal to update the state of the handler.
  */
-void InverseMouseAreaType::updateArea()
+void InverseMouseAreaType::update()
 {
     if (!m_ready) {
         return;
@@ -286,6 +286,7 @@
         m_sensingArea = QuickUtils::instance().rootItem(this);
     }
     updateEventFilter(isEnabled() && isVisible() && m_topmostItem);
+    QQuickMouseArea::update();
 }
 /*!
   \internal
@@ -300,7 +301,7 @@
 void InverseMouseAreaType::itemChange(ItemChange change, const ItemChangeData &data)
 {
     if (change == ItemParentHasChanged && data.item) {
-        updateArea();
+        update();
     }
     QQuickMouseArea::itemChange(change, data);
 }
@@ -311,7 +312,7 @@
     // by now the parents should 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;
-    updateArea();
+    update();
 }
 
 /*

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-06-09 08:26:24 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-06-18 15:29:40 +0000
@@ -53,7 +53,7 @@
     void topmostItemChanged();
 
 private Q_SLOTS:
-    void updateArea();
+    void update();
     void resetFilterOnWindowUpdate(QQuickWindow *win);
     
 private: