ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/remove-double-click-workaround into lp:ubuntu-keyboard

  1. remove-double-click-workaround
  2. Merge into trunk
Proposed by Michael Sheldon on 2015-12-10
Status: Merged
Approved by: Bill Filler on 2015-12-14
Approved revision: 427
Merged at revision: 429
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/remove-double-click-workaround
Merge into: lp:ubuntu-keyboard
Diff against target: 56 lines (+0/-14)
2 files modified
qml/keys/CharKey.qml (+0/-4)
qml/keys/PressArea.qml (+0/-10)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/remove-double-click-workaround
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-12-10
Ubuntu Phablet Team 2015-12-10 Pending
Review via email: mp+280183@code.launchpad.net

Commit Message

Remove workaround for Qt bug 44370 as this is now fixed in Qt

Description of the Change

Remove workaround for Qt bug 44370 as this is now fixed in Qt

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/keys/CharKey.qml'
2--- qml/keys/CharKey.qml 2015-11-24 15:19:44 +0000
3+++ qml/keys/CharKey.qml 2015-12-10 17:51:43 +0000
4@@ -208,10 +208,6 @@
5 }
6
7 onReleased: {
8- // Work around QT bug: https://bugreports.qt.io/browse/QTBUG-44370
9- if (invalidReleaseFromMouse) {
10- return;
11- }
12 if (overridePressArea) {
13 key.released();
14 return;
15
16=== modified file 'qml/keys/PressArea.qml'
17--- qml/keys/PressArea.qml 2015-12-01 14:11:13 +0000
18+++ qml/keys/PressArea.qml 2015-12-10 17:51:43 +0000
19@@ -26,8 +26,6 @@
20
21 /// Is true while the area is touched, and the finger did not yet lift
22 property bool pressed: false
23- property bool ongoingTouch: false
24- property bool invalidReleaseFromMouse: false
25 // Track whether we've swiped out of a key press to dismiss the keyboard
26 property bool swipedOut: false
27 property bool held: false
28@@ -107,8 +105,6 @@
29 }
30
31 onPressed: {
32- ongoingTouch = true;
33- invalidReleaseFromMouse = false;
34 pressed = true;
35 held = false;
36 swipedOut = false;
37@@ -133,11 +129,6 @@
38 }
39
40 onReleased: {
41- // Work around QT bug: https://bugreports.qt.io/browse/QTBUG-44370
42- if(!ongoingTouch) {
43- invalidReleaseFromMouse = true;
44- return;
45- }
46 // Allow the user to swipe away the keyboard
47 if (point.y > startY + units.gu(8) && !held) {
48 maliit_input_method.hide();
49@@ -145,7 +136,6 @@
50 bounceBackAnimation.from = keyboardSurface.y;
51 bounceBackAnimation.start();
52 }
53- ongoingTouch = false;
54 pressed = false;
55 held = false;
56 holdTimer.stop();

Subscribers

People subscribed via source and target branches