ubuntu-keyboard

Merge lp:~schwann/ubuntu-keyboard/keyboard-landscape-popup into lp:ubuntu-keyboard

  1. keyboard-landscape-popup
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Thomas Moenicke
Approved revision: 62
Merged at revision: 63
Proposed branch: lp:~schwann/ubuntu-keyboard/keyboard-landscape-popup
Merge into: lp:ubuntu-keyboard
Diff against target: 251 lines (+68/-76)
8 files modified
qml/Keyboard.qml (+65/-67)
qml/keys/ExtendedKeysSelector.qml (+3/-3)
qml/languages/Keyboard_en_email.qml (+0/-1)
qml/languages/Keyboard_en_url.qml (+0/-1)
qml/languages/Keyboard_en_url_search.qml (+0/-1)
qml/languages/Keyboard_en_us.qml (+0/-1)
qml/languages/Keyboard_symbols.qml (+0/-1)
qml/languages/Keyboard_zh_cn_pinyin.qml (+0/-1)
To merge this branch: bzr merge lp:~schwann/ubuntu-keyboard/keyboard-landscape-popup
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomas Moenicke (community) Approve
Review via email: mp+189778@code.launchpad.net

Commit message

Propagating mouse events does not work as expected when dragging
Going back to make the keyboard a child item of the swipe mouse area.
Fixes LP: #1236474

Description of the change

Propagating mouse events does not work as expected when dragging
Going back to make the keyboard a child item of the swipe mouse area.
Fixes LP: #1236474

Plus removes some warning at startup

To post a comment you must log in.
Revision history for this message
Thomas Moenicke (thomas-moenicke) wrote :

looks good, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/132/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-saucy-i386-ci/132

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/132/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Keyboard.qml'
2--- qml/Keyboard.qml 2013-10-03 07:01:52 +0000
3+++ qml/Keyboard.qml 2013-10-08 08:16:40 +0000
4@@ -83,70 +83,6 @@
5 }
6 }
7
8- Item {
9- id: keyboardSurface
10-
11- x:0
12- y:0
13- width: parent.width
14- height: parent.height
15-
16- WordRibbon {
17- id: wordRibbon
18- objectName: "wordRibbon"
19-
20- visible: canvas.wordribbon_visible
21-
22- anchors.bottom: keyboardComp.top
23- width: parent.width;
24-
25- height: visible ? layout.wordribbon_height : 0
26- }
27-
28- Item {
29- id: keyboardComp
30-
31- height: canvas.keypadHeight - wordRibbon.height
32- width: parent.width
33- anchors.bottom: parent.bottom
34-
35- Rectangle {
36- id: background
37-
38- anchors.fill: parent
39-
40- gradient: Gradient {
41- GradientStop { position: 0.0; color: "#f1f1f1" }
42- GradientStop { position: 1.0; color: "#e4e4e4" }
43- }
44- }
45-
46- Image {
47- id: borderTop
48- source: "styles/ubuntu/images/border_top.png"
49- width: parent.width
50- anchors.top: parent.top.bottom
51- }
52-
53- Image {
54- id: borderBottom
55- source: "styles/ubuntu/images/border_bottom.png"
56- width: parent.width
57- anchors.bottom: background.bottom
58- }
59-
60- KeyboardContainer {
61- id: keypad
62-
63- anchors.top: borderTop.bottom
64- anchors.bottom: borderBottom.top
65- anchors.topMargin: units.gu( UI.top_margin )
66- anchors.bottomMargin: units.gu( UI.bottom_margin )
67- width: parent.width
68- }
69- } // keyboardComp
70- }
71-
72 MouseArea {
73 id: swipeArea
74
75@@ -155,7 +91,7 @@
76 anchors.left: parent.left
77 anchors.right: parent.right
78 anchors.top: parent.top
79- height: keyboardComp.y + borderTop.height
80+ height: (parent.height - canvas.keypadHeight) + wordRibbon.height + units.gu(UI.top_margin)
81
82 drag.target: keyboardSurface
83 drag.axis: Drag.YAxis;
84@@ -163,8 +99,6 @@
85 drag.maximumY: parent.height
86 drag.filterChildren: true
87
88- propagateComposedEvents: true
89-
90 onReleased: {
91 if (keyboardSurface.y > jumpBackThreshold) {
92 canvas.shown = false;
93@@ -173,6 +107,70 @@
94 bounceBackAnimation.start();
95 }
96 }
97+
98+ Item {
99+ id: keyboardSurface
100+
101+ x:0
102+ y:0
103+ width: parent.width
104+ height: canvas.height
105+
106+ WordRibbon {
107+ id: wordRibbon
108+ objectName: "wordRibbon"
109+
110+ visible: canvas.wordribbon_visible
111+
112+ anchors.bottom: keyboardComp.top
113+ width: parent.width;
114+
115+ height: visible ? layout.wordribbon_height : 0
116+ }
117+
118+ Item {
119+ id: keyboardComp
120+
121+ height: canvas.keypadHeight - wordRibbon.height
122+ width: parent.width
123+ anchors.bottom: parent.bottom
124+
125+ Rectangle {
126+ id: background
127+
128+ anchors.fill: parent
129+
130+ gradient: Gradient {
131+ GradientStop { position: 0.0; color: "#f1f1f1" }
132+ GradientStop { position: 1.0; color: "#e4e4e4" }
133+ }
134+ }
135+
136+ Image {
137+ id: borderTop
138+ source: "styles/ubuntu/images/border_top.png"
139+ width: parent.width
140+ anchors.top: parent.top.bottom
141+ }
142+
143+ Image {
144+ id: borderBottom
145+ source: "styles/ubuntu/images/border_bottom.png"
146+ width: parent.width
147+ anchors.bottom: background.bottom
148+ }
149+
150+ KeyboardContainer {
151+ id: keypad
152+
153+ anchors.top: borderTop.bottom
154+ anchors.bottom: borderBottom.top
155+ anchors.topMargin: units.gu( UI.top_margin )
156+ anchors.bottomMargin: units.gu( UI.bottom_margin )
157+ width: parent.width
158+ }
159+ } // keyboardComp
160+ }
161 }
162
163 PropertyAnimation {
164
165=== modified file 'qml/keys/ExtendedKeysSelector.qml'
166--- qml/keys/ExtendedKeysSelector.qml 2013-10-01 20:24:40 +0000
167+++ qml/keys/ExtendedKeysSelector.qml 2013-10-08 08:16:40 +0000
168@@ -31,9 +31,9 @@
169 property variant extendedKeysModel
170 property Item currentlyAssignedKey
171
172- property int currentlyAssignedKeyParentY: currentlyAssignedKey.parent.y
173- property int currentlyAssignedKeyX: currentlyAssignedKey.x
174- property int currentlyAssignedKeyY: currentlyAssignedKey.y
175+ property int currentlyAssignedKeyParentY: currentlyAssignedKey ? currentlyAssignedKey.parent.y : 0
176+ property int currentlyAssignedKeyX: currentlyAssignedKey ? currentlyAssignedKey.x : 0
177+ property int currentlyAssignedKeyY: currentlyAssignedKey ? currentlyAssignedKey.y : 0
178
179 onCurrentlyAssignedKeyXChanged: __repositionPopoverTo(currentlyAssignedKey)
180 onCurrentlyAssignedKeyYChanged: __repositionPopoverTo(currentlyAssignedKey)
181
182=== modified file 'qml/languages/Keyboard_en_email.qml'
183--- qml/languages/Keyboard_en_email.qml 2013-09-11 09:19:24 +0000
184+++ qml/languages/Keyboard_en_email.qml 2013-10-08 08:16:40 +0000
185@@ -77,7 +77,6 @@
186 Item {
187 anchors.left: parent.left
188 anchors.right: parent.right
189- anchors.horizontalCenter: parent.horizontalCenter;
190
191 height: panel.keyHeight;
192
193
194=== modified file 'qml/languages/Keyboard_en_url.qml'
195--- qml/languages/Keyboard_en_url.qml 2013-09-11 09:39:31 +0000
196+++ qml/languages/Keyboard_en_url.qml 2013-10-08 08:16:40 +0000
197@@ -77,7 +77,6 @@
198 Item {
199 anchors.left: parent.left
200 anchors.right: parent.right
201- anchors.horizontalCenter: parent.horizontalCenter;
202
203 height: panel.keyHeight;
204
205
206=== modified file 'qml/languages/Keyboard_en_url_search.qml'
207--- qml/languages/Keyboard_en_url_search.qml 2013-09-11 09:19:24 +0000
208+++ qml/languages/Keyboard_en_url_search.qml 2013-10-08 08:16:40 +0000
209@@ -78,7 +78,6 @@
210 Item {
211 anchors.left: parent.left
212 anchors.right: parent.right
213- anchors.horizontalCenter: parent.horizontalCenter;
214
215 height: panel.keyHeight;
216
217
218=== modified file 'qml/languages/Keyboard_en_us.qml'
219--- qml/languages/Keyboard_en_us.qml 2013-09-10 15:45:28 +0000
220+++ qml/languages/Keyboard_en_us.qml 2013-10-08 08:16:40 +0000
221@@ -77,7 +77,6 @@
222 Item {
223 anchors.left: parent.left
224 anchors.right: parent.right
225- anchors.horizontalCenter: parent.horizontalCenter;
226
227 height: panel.keyHeight;
228
229
230=== modified file 'qml/languages/Keyboard_symbols.qml'
231--- qml/languages/Keyboard_symbols.qml 2013-09-30 12:36:21 +0000
232+++ qml/languages/Keyboard_symbols.qml 2013-10-08 08:16:40 +0000
233@@ -82,7 +82,6 @@
234 Item {
235 anchors.left: parent.left
236 anchors.right: parent.right
237- anchors.horizontalCenter: parent.horizontalCenter;
238
239 height: panel.keyHeight;
240
241
242=== modified file 'qml/languages/Keyboard_zh_cn_pinyin.qml'
243--- qml/languages/Keyboard_zh_cn_pinyin.qml 2013-09-16 14:28:33 +0000
244+++ qml/languages/Keyboard_zh_cn_pinyin.qml 2013-10-08 08:16:40 +0000
245@@ -77,7 +77,6 @@
246 Item {
247 anchors.left: parent.left
248 anchors.right: parent.right
249- anchors.horizontalCenter: parent.horizontalCenter;
250
251 height: panel.keyHeight;
252

Subscribers

People subscribed via source and target branches