1
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
2
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-09-30 18:55:20 +0000
3
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-10-28 16:01:24 +0000
4
@@ -81,7 +81,7 @@
5
81
{
81
{
6
82
    UCActionItem::componentComplete();
82
    UCActionItem::componentComplete();
7
83
    // connect to the right slot, using macros so we get the proper slot
83
    // connect to the right slot, using macros so we get the proper slot
9
84
    connect(this, SIGNAL(clicked()), this, SLOT(trigger()));
84
    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(trigger()));
10
85
85
11
86
    // bind mouse area
86
    // bind mouse area
12
87
    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
87
    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
13
88
88
14
=== modified file 'tests/unit_x11/tst_components/tst_abstractbutton13.qml'
15
--- tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-09-30 18:55:20 +0000
16
+++ tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-10-28 16:01:24 +0000
17
@@ -97,7 +97,9 @@
18
97
            absButton.action = action1
97
            absButton.action = action1
19
98
            compare(absButton.action, action1, "Action can be set")
98
            compare(absButton.action, action1, "Action can be set")
20
99
            var numTriggers = action1.triggerCount
99
            var numTriggers = action1.triggerCount
22
100
            absButton.clicked()
100
            triggeredSpy.target = absButton.action;
23
101
            mouseClick(absButton, centerOf(absButton).x, centerOf(absButton).y);
24
102
            triggeredSpy.wait(500);
25
101
            compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
103
            compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
26
102
            absButton.action = null
104
            absButton.action = null
27
103
        }
105
        }
28
104
106
29
=== added file 'tests/unit_x11/tst_components/tst_bug1510919.qml'
30
--- tests/unit_x11/tst_components/tst_bug1510919.qml	1970-01-01 00:00:00 +0000
31
+++ tests/unit_x11/tst_components/tst_bug1510919.qml	2015-10-28 16:01:24 +0000
32
@@ -0,0 +1,75 @@
33
1
/*
34
2
 * Copyright 2015 Canonical Ltd.
35
3
 *
36
4
 * This program is free software; you can redistribute it and/or modify
37
5
 * it under the terms of the GNU Lesser General Public License as published by
38
6
 * the Free Software Foundation; version 3.
39
7
 *
40
8
 * This program is distributed in the hope that it will be useful,
41
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
42
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
43
11
 * GNU Lesser General Public License for more details.
44
12
 *
45
13
 * You should have received a copy of the GNU Lesser General Public License
46
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
47
15
 */
48
16
49
17
import QtQuick 2.4
50
18
import Ubuntu.Components 1.3
51
19
import QtTest 1.0
52
20
import Ubuntu.Test 1.0
53
21
54
22
MainView {
55
23
    width: units.gu(40)
56
24
    height: units.gu(71)
57
25
58
26
    Column {
59
27
        CheckBox {
60
28
            id: checkBox
61
29
        }
62
30
        Switch {
63
31
            id: switchBox
64
32
        }
65
33
    }
66
34
67
35
    UbuntuTestCase {
68
36
        name: "CheckAndSwitch"
69
37
        when: windowShown
70
38
71
39
        SignalSpy {
72
40
            id: clickSpy
73
41
            signalName: "clicked"
74
42
        }
75
43
76
44
        function cleanup() {
77
45
            clickSpy.target = null;
78
46
            clickSpy.clear();
79
47
            checkBox.checked = false;
80
48
            switchBox.checked = false;
81
49
        }
82
50
83
51
        function initTestCase() {
84
52
            TestExtras.registerTouchDevice();
85
53
        }
86
54
87
55
        function test_checked_in_sync_with_clicked_data() {
88
56
            return [
89
57
                {tag: "CheckBox with touch", item: checkBox, touch: true},
90
58
                {tag: "CheckBox with mouse", item: checkBox, touch: false},
91
59
                {tag: "Switch with touch", item: switchBox, touch: true},
92
60
                {tag: "Switch with mouse", item: switchBox, touch: false},
93
61
            ];
94
62
        }
95
63
        function test_checked_in_sync_with_clicked(data) {
96
64
            var checked = data.item.checked;
97
65
            clickSpy.target = data.item;
98
66
            if (data.touch) {
99
67
                TestExtras.touchClick(0, data.item, centerOf(data.item));
100
68
            } else {
101
69
                mouseClick(data.item, centerOf(data.item).x, centerOf(data.item).y);
102
70
            }
103
71
            clickSpy.wait(500);
104
72
            compare(data.item.checked, !checked, "checked property shoudl be altered!");
105
73
        }
106
74
    }
107
75
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-29
Zoltan Balogh		2015-10-28	Approve on 2015-10-28
Review via email: mp+276016@code.launchpad.net