1
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
2
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-04-20 19:25:12 +0000
3
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-25 05:30:32 +0000
4
@@ -204,6 +204,7 @@
5
204
204
6
205
    StyledItem {
205
    StyledItem {
7
206
        id: foreground
206
        id: foreground
8
207
        objectName: "popover_foreground"
9
207
208
10
208
        //styling properties
209
        //styling properties
11
209
        property real minimumWidth: units.gu(40)
210
        property real minimumWidth: units.gu(40)
12
210
211
13
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
14
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-20 19:25:12 +0000
15
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-25 05:30:32 +0000
16
@@ -142,6 +142,7 @@
17
142
    InverseMouseArea {
142
    InverseMouseArea {
18
143
        id: eventGrabber
143
        id: eventGrabber
19
144
        enabled: true
144
        enabled: true
20
145
        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
21
145
        anchors.fill: __foreground
146
        anchors.fill: __foreground
22
146
        sensingArea: dismissArea
147
        sensingArea: dismissArea
23
147
        propagateComposedEvents: !grabDismissAreaEvents
148
        propagateComposedEvents: !grabDismissAreaEvents
24
148
149
25
=== added file 'tests/unit_x11/tst_components/tst_popover.qml'
26
--- tests/unit_x11/tst_components/tst_popover.qml	1970-01-01 00:00:00 +0000
27
+++ tests/unit_x11/tst_components/tst_popover.qml	2014-04-25 05:30:32 +0000
28
@@ -0,0 +1,83 @@
29
1
/*
30
2
 * Copyright 2014 Canonical Ltd.
31
3
 *
32
4
 * This program is free software; you can redistribute it and/or modify
33
5
 * it under the terms of the GNU Lesser General Public License as published by
34
6
 * the Free Software Foundation; version 3.
35
7
 *
36
8
 * This program is distributed in the hope that it will be useful,
37
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
38
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
39
11
 * GNU Lesser General Public License for more details.
40
12
 *
41
13
 * You should have received a copy of the GNU Lesser General Public License
42
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
43
15
 */
44
16
import QtQuick 2.0
45
17
import QtTest 1.0
46
18
import Ubuntu.Test 0.1
47
19
import Ubuntu.Components 0.1
48
20
import Ubuntu.Components.Popups 0.1
49
21
50
22
MainView {
51
23
    id: main
52
24
    width: units.gu(40)
53
25
    height: units.gu(71)
54
26
55
27
    Button {
56
28
        id: caller
57
29
        anchors.centerIn: parent
58
30
        text: "Press me"
59
31
        onClicked: {
60
32
            var popover = PopupUtils.open(popoverComponent, caller);
61
33
            popoverSpy.target = testCase.findChild(popover, "popover_foreground");
62
34
            popoverSpy.clear();
63
35
        }
64
36
    }
65
37
66
38
    // spy to listen on the popover foreground's hideCompleted() signal
67
39
    SignalSpy {
68
40
        id: popoverSpy
69
41
        signalName: "hideCompleted"
70
42
    }
71
43
72
44
    Component {
73
45
        id: popoverComponent
74
46
        Popover {
75
47
            objectName: "popover"
76
48
            Rectangle {
77
49
                width: units.gu(20)
78
50
                height: units.gu(20)
79
51
                color: "blue"
80
52
            }
81
53
        }
82
54
    }
83
55
84
56
    UbuntuTestCase {
85
57
        id: testCase
86
58
        name: "PopoverTests"
87
59
        when: windowShown
88
60
89
61
        function cleanup() {
90
62
            popoverSpy.target = null;
91
63
            popoverSpy.clear();
92
64
        }
93
65
94
66
        function test_dismiss_on_click_data() {
95
67
            return [
96
68
                        {button: Qt.LeftButton},
97
69
                        {button: Qt.MiddleButton},
98
70
                        {button: Qt.RightButton},
99
71
                    ];
100
72
        }
101
73
102
74
        function test_dismiss_on_click(data) {
103
75
            mouseClick(caller, caller.width / 2, caller.height / 2);
104
76
            waitForRendering(caller);
105
77
            verify(popoverSpy.target !== null, "The popover did not open");
106
78
            // dismiss
107
79
            mouseClick(main, 10, 10, data.button);
108
80
            popoverSpy.wait();
109
81
        }
110
82
    }
111
83
}
Status:	Merged
Approved by:	Cris Dywan on 2014-04-25
Approved revision:	1016
Merged at revision:	1022
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection
Diff against target:	111 lines (+85/-0) 3 files modified modules/Ubuntu/Components/Popups/Popover.qml (+1/-0) modules/Ubuntu/Components/Popups/PopupBase.qml (+1/-0) tests/unit_x11/tst_components/tst_popover.qml (+83/-0)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Cris Dywan		2014-04-16	Approve on 2014-04-25
PS Jenkins bot	continuous-integration		Approve on 2014-04-25
Review via email: mp+216006@code.launchpad.net