Ubuntu Calculator App

Merge lp:~rpadovani/ubuntu-calculator-app/waitUntilOskIsHidden into lp:ubuntu-calculator-app

  1. waitUntilOskIsHidden
  2. Merge into trunk
Proposed by Riccardo Padovani on 2015-04-01
Status: Merged
Approved by: Riccardo Padovani on 2015-04-07
Approved revision: 149
Merged at revision: 152
Proposed branch: lp:~rpadovani/ubuntu-calculator-app/waitUntilOskIsHidden
Merge into: lp:ubuntu-calculator-app
Diff against target: 44 lines (+4/-8)
1 file modified
app/ubuntu-calculator-app.qml (+4/-8)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-calculator-app/waitUntilOskIsHidden
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-04-07
Alan Pope 🍺🐧🐱 🦄 2015-04-01 Approve on 2015-04-07
Review via email: mp+254875@code.launchpad.net

Commit Message

Wait until osk keyboard is hidden before showing our custom keyboard

Description of the Change

Wait until osk keyboard is hidden before showing our custom keyboard

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Tested this on my krillin and it works well!

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ubuntu-calculator-app.qml'
2--- app/ubuntu-calculator-app.qml 2015-03-30 08:33:45 +0000
3+++ app/ubuntu-calculator-app.qml 2015-04-06 12:49:50 +0000
4@@ -34,7 +34,7 @@
5 // Removes the old toolbar and enables new features of the new header.
6 useDeprecatedToolbar: false;
7 automaticOrientation: true
8- anchorToKeyboard: true
9+ anchorToKeyboard: textInputField.visible ? false : true
10
11 width: units.gu(40);
12 height: units.gu(70);
13@@ -73,11 +73,6 @@
14 // If it is set to false, then editing will be invoked
15 property bool deleteSelectedCalculation: true;
16
17- Connections {
18- id: oskKeyboard
19- target: Qt.inputMethod
20- }
21-
22 /**
23 * The function calls the Formula.deleteLastFormulaElement function and
24 * place the result in right vars
25@@ -508,6 +503,7 @@
26 anchors {
27 top: header.bottom
28 bottom: parent.bottom
29+ bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height
30 left: parent.left
31 right: parent.right
32 }
33@@ -635,9 +631,9 @@
34 Loader {
35 id: keyboardLoader
36 width: parent.width
37- visible: textInputField.visible && !oskKeyboard.visible
38 source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
39- opacity: ((y + height) >= scrollableView.contentY) && (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
40+ opacity: ((y + height) >= scrollableView.contentY) &&
41+ (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0
42 }
43 }
44 }

Subscribers

People subscribed via source and target branches