1
=== added file 'KeyboardRectangle.qml'
2
--- KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
3
+++ KeyboardRectangle.qml	2013-07-26 18:20:36 +0000
4
@@ -0,0 +1,81 @@
5
1
/*
6
2
 * Copyright 2013 Canonical Ltd.
7
3
 *
8
4
 * This file is part of notes-app.
9
5
 *
10
6
 * webbrowser-app is free software; you can redistribute it and/or modify
11
7
 * it under the terms of the GNU General Public License as published by
12
8
 * the Free Software Foundation; version 3.
13
9
 *
14
10
 * webbrowser-app is distributed in the hope that it will be useful,
15
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
13
 * GNU General Public License for more details.
18
14
 *
19
15
 * You should have received a copy of the GNU General Public License
20
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
17
 */
22
18
23
19
// This file was originally part of the telephony application.
24
20
// It is a workaround required to handle interaction with the OSK,
25
21
// until the shell/WM takes care of that on behalf of the applications.
26
22
27
23
import QtQuick 2.0
28
24
import Ubuntu.Components 0.1
29
25
30
26
Item {
31
27
    id: keyboardRect
32
28
    anchors.left: parent.left
33
29
    anchors.right: parent.right
34
30
    anchors.bottom: parent.bottom
35
31
    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
36
32
37
33
    Behavior on height {
38
34
        UbuntuNumberAnimation {}
39
35
    }
40
36
41
37
    states: [
42
38
        State {
43
39
            name: "hidden"
44
40
            when: keyboardRect.height == 0
45
41
        },
46
42
        State {
47
43
            name: "shown"
48
44
            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
49
45
        }
50
46
    ]
51
47
52
48
    function recursiveFindFocusedItem(parent) {
53
49
        if (parent.activeFocus) {
54
50
            return parent;
55
51
        }
56
52
57
53
        for (var i in parent.children) {
58
54
            var child = parent.children[i];
59
55
            if (child.activeFocus) {
60
56
                return child;
61
57
            }
62
58
63
59
            var item = recursiveFindFocusedItem(child);
64
60
65
61
            if (item != null) {
66
62
                return item;
67
63
            }
68
64
        }
69
65
70
66
        return null;
71
67
    }
72
68
73
69
    Connections {
74
70
        target: Qt.inputMethod
75
71
76
72
        onVisibleChanged: {
77
73
            if (!Qt.inputMethod.visible) {
78
74
                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
79
75
                if (focusedItem != null) {
80
76
                    focusedItem.focus = false;
81
77
                }
82
78
            }
83
79
        }
84
80
    }
85
81
}
86
0
82
87
=== modified file 'NotesApp.qml'
88
--- NotesApp.qml	2013-07-24 14:52:07 +0000
89
+++ NotesApp.qml	2013-07-26 18:20:36 +0000
90
@@ -118,40 +118,6 @@
91
118
        noteList.setActiveIndex(0);
118
        noteList.setActiveIndex(0);
92
119
    }
119
    }
93
120
120
129
121
    // Workaround for https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1201400.
121
    KeyboardRectangle {
95
122
    // Inspired by the KeyboardRectangle component, originally written for the
96
123
    // telephony application.
97
124
    Connections {
98
125
        target: Qt.inputMethod
99
126
100
127
        onVisibleChanged: {
101
128
            if (!Qt.inputMethod.visible) {
102
129
                var focusedItem = recursiveFindFocusedItem(window);
103
130
                if (focusedItem != null) {
104
131
                    focusedItem.focus = false;
105
132
                }
106
133
            }
107
134
        }
108
135
109
136
        function recursiveFindFocusedItem(parent) {
110
137
            if (parent.activeFocus) {
111
138
                return parent;
112
139
            }
113
140
114
141
            for (var i in parent.children) {
115
142
                var child = parent.children[i];
116
143
                if (child.activeFocus) {
117
144
                    return child;
118
145
                }
119
146
120
147
                var item = recursiveFindFocusedItem(child);
121
148
122
149
                if (item != null) {
123
150
                    return item;
124
151
                }
125
152
            }
126
153
127
154
            return null;
128
155
        }
130
156
    }
122
    }
131
157
}
123
}
132
158
124
133
=== modified file 'tests/autopilot/notes_app/emulators/main_window.py'
134
--- tests/autopilot/notes_app/emulators/main_window.py	2013-04-08 11:22:07 +0000
135
+++ tests/autopilot/notes_app/emulators/main_window.py	2013-07-26 18:20:36 +0000
136
@@ -27,3 +27,6 @@
137
27
        edit = note_item.select_single("MixedEdit")
27
        edit = note_item.select_single("MixedEdit")
138
28
        parts = edit.select_single("QQuickColumn").get_children_by_type("QQuickLoader")
28
        parts = edit.select_single("QQuickColumn").get_children_by_type("QQuickLoader")
139
29
        return parts
29
        return parts
140
30
141
31
    def get_keyboard_rectangle(self):
142
32
        return self.app.select_single("KeyboardRectangle")
143
30
33
144
=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
145
--- tests/autopilot/notes_app/tests/__init__.py	2013-07-23 12:04:26 +0000
146
+++ tests/autopilot/notes_app/tests/__init__.py	2013-07-26 18:20:36 +0000
147
@@ -14,8 +14,10 @@
148
14
import base64
14
import base64
149
15
15
150
16
from autopilot.input import Mouse, Touch, Pointer
16
from autopilot.input import Mouse, Touch, Pointer
151
17
from autopilot.matchers import Eventually
152
17
from autopilot.platform import model
18
from autopilot.platform import model
153
18
from autopilot.testcase import AutopilotTestCase
19
from autopilot.testcase import AutopilotTestCase
154
20
from testtools.matchers import Equals
155
19
21
156
20
from notes_app.emulators.main_window import MainWindow
22
from notes_app.emulators.main_window import MainWindow
157
21
import imagedata
23
import imagedata
158
@@ -77,6 +79,18 @@
159
77
        # the process during regular test setup.
79
        # the process during regular test setup.
160
78
        self.doCleanups()
80
        self.doCleanups()
161
79
81
162
82
    def assert_osk_eventually_shown(self):
163
83
        if model() != 'Desktop':
164
84
            keyboardRectangle = self.main_window.get_keyboard_rectangle()
165
85
            self.assertThat(keyboardRectangle.state,
166
86
                            Eventually(Equals("shown")))
167
87
168
88
    def assert_osk_eventually_hidden(self):
169
89
        if model() != 'Desktop':
170
90
            keyboardRectangle = self.main_window.get_keyboard_rectangle()
171
91
            self.assertThat(keyboardRectangle.state,
172
92
                            Eventually(Equals("hidden")))
173
93
174
80
    @property
94
    @property
175
81
    def main_window(self):
95
    def main_window(self):
176
82
        return MainWindow(self.app)
96
        return MainWindow(self.app)
177
83
97
178
=== modified file 'tests/autopilot/notes_app/tests/test_parts.py'
179
--- tests/autopilot/notes_app/tests/test_parts.py	2013-07-23 12:21:36 +0000
180
+++ tests/autopilot/notes_app/tests/test_parts.py	2013-07-26 18:20:36 +0000
181
@@ -16,7 +16,6 @@
182
16
from notes_app.tests import NotesTestCaseBaseWithHTTPServer, DatabaseMixin
16
from notes_app.tests import NotesTestCaseBaseWithHTTPServer, DatabaseMixin
183
17
17
184
18
import sqlite3
18
import sqlite3
185
19
from time import sleep
186
20
19
187
21
20
188
22
class TestFocus(NotesTestCaseBaseWithHTTPServer, DatabaseMixin):
21
class TestFocus(NotesTestCaseBaseWithHTTPServer, DatabaseMixin):
189
@@ -80,17 +79,18 @@
190
80
        part_x, part_y, part_w, part_h = image.globalRect
79
        part_x, part_y, part_w, part_h = image.globalRect
191
81
        self.pointing_device.move(part_x + part_w / 2, part_y + 1)
80
        self.pointing_device.move(part_x + part_w / 2, part_y + 1)
192
82
        self.pointing_device.click()
81
        self.pointing_device.click()
193
82
        self.assert_osk_eventually_shown()
194
83
        self.assertThat(text.activeFocus, Eventually(Equals(True)))
83
        self.assertThat(text.activeFocus, Eventually(Equals(True)))
195
84
84
196
85
        # Clicking on the lower half of the image should create a new text area below
85
        # Clicking on the lower half of the image should create a new text area below
197
86
        # the image and focus it
86
        # the image and focus it
198
87
        self.pointing_device.move(part_x + part_w / 2, part_y + part_h - 1)
87
        self.pointing_device.move(part_x + part_w / 2, part_y + part_h - 1)
199
88
        self.pointing_device.click()
88
        self.pointing_device.click()
200
89
        self.assert_osk_eventually_hidden()
201
89
        # On the phone input focus is lost when the OSK appears so
90
        # On the phone input focus is lost when the OSK appears so
202
90
        # we click the input box to gain focus again. LP: #1204084
91
        # we click the input box to gain focus again. LP: #1204084
203
91
        if model() != 'Desktop':
92
        if model() != 'Desktop':
206
92
            sleep(1)
93
            self.pointing_device.click()
205
93
        self.pointing_device.click()
207
94
        self.assertThat(text.activeFocus, Eventually(Equals(False)))
94
        self.assertThat(text.activeFocus, Eventually(Equals(False)))
208
95
95
209
96
        parts = self.main_window.get_note_parts(note)
96
        parts = self.main_window.get_note_parts(note)
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2013-07-24	Approve on 2013-07-29
PS Jenkins bot	continuous-integration		Approve on 2013-07-26
Review via email: mp+176788@code.launchpad.net