1
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
2
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-05 05:59:07 +0000
3
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-11 12:39:17 +0000
4
@@ -138,10 +138,9 @@
5
138
    switch (event->key()) {
138
    switch (event->key()) {
6
139
        case Qt::Key_Enter:
139
        case Qt::Key_Enter:
7
140
        case Qt::Key_Return:
140
        case Qt::Key_Return:
10
141
        // FIXME: space may also come here, however that depends on the button type
141
        case Qt::Key_Space:
9
142
        // (i.e default Dialog btn) so we may need to add that to Button
11
143
        {
142
        {
13
144
            Q_EMIT clicked();
143
            trigger();
14
145
            break;
144
            break;
15
146
        }
145
        }
16
147
    }
146
    }
17
148
147
18
=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
19
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-09-16 05:26:36 +0000
20
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-12-11 12:39:17 +0000
21
@@ -336,6 +336,7 @@
22
336
void UCActionItem::trigger(const QVariant &value)
336
void UCActionItem::trigger(const QVariant &value)
23
337
{
337
{
24
338
    if (isEnabled()) {
338
    if (isEnabled()) {
25
339
        // FIXME: bug #1524234: invoke function from QMetaObject (zsombi)
26
339
        Q_EMIT triggered(value);
340
        Q_EMIT triggered(value);
27
340
    }
341
    }
28
341
}
342
}
29
342
343
30
=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
31
--- tests/unit_x11/tst_components/tst_focus.qml	2015-11-25 15:09:07 +0000
32
+++ tests/unit_x11/tst_components/tst_focus.qml	2015-12-11 12:39:17 +0000
33
@@ -140,6 +140,11 @@
34
140
        when: windowShown
140
        when: windowShown
35
141
141
36
142
        SignalSpy {
142
        SignalSpy {
37
143
            id: buttonTriggerSpy
38
144
            signalName: "onTriggered"
39
145
        }
40
146
41
147
        SignalSpy {
42
143
            id: popupCloseSpy
148
            id: popupCloseSpy
43
144
            signalName: "onDestruction"
149
            signalName: "onDestruction"
44
145
        }
150
        }
45
@@ -266,6 +271,21 @@
46
266
            verify(popoverTest.focus, "Button focus not restored.");
271
            verify(popoverTest.focus, "Button focus not restored.");
47
267
        }
272
        }
48
268
273
49
274
        function test_button_trigger_via_keyboard_data() {
50
275
            return [
51
276
                {tag: "Enter", key: Qt.Key_Enter},
52
277
                {tag: "Return", key: Qt.Key_Return},
53
278
                {tag: "Space", key: Qt.Key_Space},
54
279
            ];
55
280
        }
56
281
        function test_button_trigger_via_keyboard(data) {
57
282
            buttonTriggerSpy.target = button;
58
283
            button.forceActiveFocus();
59
284
            keyClick(data.key);
60
285
            waitForRendering(button);
61
286
            buttonTriggerSpy.wait();
62
287
        }
63
288
64
269
        function test_disabled_component_does_not_focus() {
289
        function test_disabled_component_does_not_focus() {
65
270
            mousePress(disabledButton, centerOf(disabledButton).x, centerOf(disabledButton).y);
290
            mousePress(disabledButton, centerOf(disabledButton).x, centerOf(disabledButton).y);
66
271
            compare(disabledButton.focus, false, "Disabled component shoudl not focus");
291
            compare(disabledButton.focus, false, "Disabled component shoudl not focus");
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-12-11
Zsombor Egri		2015-12-08	Approve on 2015-12-11
Review via email: mp+279898@code.launchpad.net