Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/inverse-mouse-area-move-allowed-on-clicks into lp:ubuntu-ui-toolkit

[Ugo Riboni]

Make InverseMouseArea and MouseArea behave the same way when the mouse is moved between a click and release event, i.e. they both generate a click.

Make InverseMouseArea and MouseArea behave the same way when the mouse is moved between a click and release event, i.e. they both generate a click.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/388/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1467
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1471/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1254

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

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good, works in the same way as MouseArea does

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/428/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1654/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/285
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1658
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1658/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1403/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:648
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/430/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/287
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1665
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1665/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1410

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

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-05-29 14:44:26 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2013-07-23 11:57:39 +0000
@@ -85,7 +85,6 @@
     QQuickItem(parent),
     m_ready(false),
     m_pressed(false),
-    m_moved(false),
     m_propagateEvents(false),
     m_acceptedButtons(Qt::LeftButton),
     m_sensingArea(QuickUtils::instance().rootItem(this)),
@@ -293,7 +292,7 @@
  */
 void InverseMouseAreaType::reset()
 {
-    m_pressed = m_moved = false;
+    m_pressed = false;
     if (m_event)
         delete m_event;
     m_event = 0;
@@ -372,13 +371,11 @@
     bool consume = true;
     if (m_pressed && contains(mapFromScene(event->windowPos()))) {
         // released outside (inside the sensing area)
-        saveEvent(*event, !m_moved);
+        saveEvent(*event, true);
         m_pressed = false;
         asyncEmit(&InverseMouseAreaType::released);
         Q_EMIT pressedChanged();
-        if (!m_moved)
-            asyncEmit(&InverseMouseAreaType::clicked);
-        m_moved = false;
+        asyncEmit(&InverseMouseAreaType::clicked);
     } else {
         // the release happened inside the area, which is outside of the active area
         reset();
@@ -407,14 +404,11 @@
 /*!
   \internal
   Captures mouse move event. Consumes event depending on the propagateEvent state.
-  Depending whether the mouse was moved after being pressed, the clicked composed
-  event will not be emitted.
  */
 bool InverseMouseAreaType::mouseMove(QMouseEvent *event)
 {
     // use localPos as we saved the mapped position as
     if (m_pressed && m_event && (event->windowPos() != QPointF(m_event->x(), m_event->y()))) {
-        m_moved = true;
         event->setAccepted(!m_propagateEvents);
     }
     return false;

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h	2013-05-29 14:44:26 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h	2013-07-23 11:57:39 +0000
@@ -79,7 +79,6 @@
 private:
     bool m_ready;
     bool m_pressed;
-    bool m_moved;
     bool m_propagateEvents;
     Qt::MouseButtons m_acceptedButtons;
     QQuickItem *m_sensingArea;