1
=== modified file 'src/Ubuntu/Components/plugin/ucmousefilters.cpp'
2
--- src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-01-30 12:03:31 +0000
3
+++ src/Ubuntu/Components/plugin/ucmousefilters.cpp	2016-04-06 22:19:21 +0000
4
@@ -608,7 +608,8 @@
5
608
            m_pressAndHoldTimer.stop();
608
            m_pressAndHoldTimer.stop();
6
609
        }
609
        }
7
610
610
9
611
        setHovered(true, 0);
611
        setHovered(m_owner->contains(m_lastPos), Q_NULLPTR);
10
612
11
612
        m_moved = true;
613
        m_moved = true;
12
613
        m_doubleClicked = false;
614
        m_doubleClicked = false;
13
614
        QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
615
        QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
14
615
616
15
=== added file 'tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml'
16
--- tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml	1970-01-01 00:00:00 +0000
17
+++ tests/unit_x11/tst_mousefilters/EnteredExitedOnMouseMove.qml	2016-04-06 22:19:21 +0000
18
@@ -0,0 +1,32 @@
19
1
/*
20
2
 * Copyright 2016 Canonical Ltd.
21
3
 *
22
4
 * This program is free software; you can redistribute it and/or modify
23
5
 * it under the terms of the GNU Lesser General Public License as published by
24
6
 * the Free Software Foundation; version 3.
25
7
 *
26
8
 * This program is distributed in the hope that it will be useful,
27
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
28
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
29
11
 * GNU Lesser General Public License for more details.
30
12
 *
31
13
 * You should have received a copy of the GNU Lesser General Public License
32
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
33
15
 */
34
16
35
17
import QtQuick 2.4
36
18
import Ubuntu.Components 1.3
37
19
38
20
Rectangle {
39
21
    width: units.gu(50)
40
22
    height: units.gu(40)
41
23
    
42
24
    MouseArea {
43
25
        anchors.fill: parent
44
26
        anchors.margins: units.gu(10)
45
27
        
46
28
        objectName: "FilterOwner"
47
29
        hoverEnabled: true
48
30
        Mouse.enabled: true
49
31
    }
50
32
}
51
0
\ No newline at end of file
33
\ No newline at end of file
52
1
34
53
=== modified file 'tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp'
54
--- tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2016-02-09 13:15:19 +0000
55
+++ tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2016-04-06 22:19:21 +0000
56
@@ -981,6 +981,76 @@
57
981
        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, QPoint(x, i));
981
        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, QPoint(x, i));
58
982
    }
982
    }
59
983
983
60
984
    //This is to test that entered/exited events are fired as a consequence of a mouse move.
61
985
    //When mouse is PRESSED, in fact, you won't get hover events. Mouse moves have to update
62
986
    //the hovered state (and that will trigger entered()/exited()). This fixes lp:1566378
63
987
    void testCase_enteredExitedOnMouseMove_lp1566378() {
64
988
        QScopedPointer<QQuickView> view(loadTest("EnteredExitedOnMouseMove.qml"));
65
989
        QVERIFY(view);
66
990
        UCMouse *filter = attachedFilter<UCMouse>(view->rootObject(), "FilterOwner");
67
991
        QVERIFY(filter);
68
992
        QSignalSpy pressed(filter, SIGNAL(pressed(QQuickMouseEvent*, QQuickItem*)));
69
993
        QSignalSpy positionChanged(filter, SIGNAL(positionChanged(QQuickMouseEvent*, QQuickItem*)));
70
994
        QSignalSpy entered(filter, SIGNAL(entered(QQuickMouseEvent*, QQuickItem*)));
71
995
        QSignalSpy exited(filter, SIGNAL(exited(QQuickMouseEvent*, QQuickItem*)));
72
996
73
997
        QObject::connect(filter, SIGNAL(pressed(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent(QQuickMouseEvent*, QQuickItem*)));
74
998
        QObject::connect(filter, SIGNAL(positionChanged(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent2(QQuickMouseEvent*, QQuickItem*)));
75
999
        QObject::connect(filter, SIGNAL(entered(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent3(QQuickMouseEvent*, QQuickItem*)));
76
1000
        QObject::connect(filter, SIGNAL(exited(QQuickMouseEvent*, QQuickItem*)), this, SLOT(onMouseEvent3(QQuickMouseEvent*, QQuickItem*)));
77
1001
78
1002
        preventDblClick();
79
1003
80
1004
        //don't use guPoint(0,0) as it's the same as not passing any point, i.e. it sends mouseMove to the
81
1005
        //center of the view
82
1006
        QTest::mouseMove(view.data(), guPoint(1, 1));
83
1007
        QTest::mouseMove(view.data(), guPoint(15, 15));
84
1008
        QTest::waitForEvents();
85
1009
86
1010
        QCOMPARE(entered.count(), 1);
87
1011
        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
88
1012
        QCOMPARE(mouseEvent3Params.pressedButton, Qt::NoButton);
89
1013
90
1014
        QTest::mousePress(view.data(), Qt::LeftButton, 0, guPoint(15, 15));
91
1015
        QTest::waitForEvents();
92
1016
        QCOMPARE(mouseEventParams.handler, QString("EVENT1"));
93
1017
        QCOMPARE(mouseEventParams.pressedButton, Qt::LeftButton);
94
1018
95
1019
        QTest::mouseMove(view.data(), guPoint(25, 15));
96
1020
97
1021
        //go out of the mousearea on the right
98
1022
        QTest::mouseMove(view.data(), guPoint(45, 15));
99
1023
        QTest::waitForEvents();
100
1024
        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
101
1025
        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
102
1026
        QCOMPARE(exited.count(), 1);
103
1027
        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
104
1028
        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
105
1029
106
1030
        //move back in
107
1031
        QTest::mouseMove(view.data(), guPoint(25, 15));
108
1032
        QTest::waitForEvents();
109
1033
        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
110
1034
        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
111
1035
        QCOMPARE(entered.count(), 2);
112
1036
        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
113
1037
        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
114
1038
115
1039
        //and out again
116
1040
        QTest::mouseMove(view.data(), guPoint(45, 15));
117
1041
        QTest::waitForEvents();
118
1042
        QCOMPARE(mouseEvent2Params.handler, QString("EVENT2"));
119
1043
        QCOMPARE(mouseEvent2Params.pressedButton, Qt::LeftButton);
120
1044
        QCOMPARE(exited.count(), 2);
121
1045
        QCOMPARE(mouseEvent3Params.handler, QString("EVENT4"));
122
1046
        QCOMPARE(mouseEvent3Params.pressedButton, Qt::LeftButton);
123
1047
124
1048
        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, guPoint(45, 15));
125
1049
        QTest::waitForEvents();
126
1050
127
1051
        QCOMPARE(positionChanged.count(), 4);
128
1052
    }
129
1053
130
984
    void testCase_hoverEvents() {
1054
    void testCase_hoverEvents() {
131
985
        QScopedPointer<QQuickView> view(loadTest("HoverEvent.qml"));
1055
        QScopedPointer<QQuickView> view(loadTest("HoverEvent.qml"));
132
986
        QVERIFY(view);
1056
        QVERIFY(view);
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-04-07
Zsombor Egri		2016-04-05	Approve on 2016-04-06
Review via email: mp+291033@code.launchpad.net