Merge lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-fix-keyboard into lp:ubuntu-calculator-app

Proposed by Bartosz Kosiorek
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 255
Merged at revision: 254
Proposed branch: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-fix-keyboard
Merge into: lp:ubuntu-calculator-app
Diff against target: 11 lines (+0/-1)
1 file modified
app/ubuntu-calculator-app.qml (+0/-1)
To merge this branch: bzr merge lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-fix-keyboard
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Calculator Developers Pending
Review via email: mp+281014@code.launchpad.net

Commit message

Remove asynchronous loading of virtual keyboard, as it is causing issues with display

Description of the change

Remove asynchronous loading of virtual keyboard, as it is causing issues with display

To post a comment you must log in.
255. By Bartosz Kosiorek

Remove networking

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
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-12-20 00:41:53 +0000
3+++ app/ubuntu-calculator-app.qml 2015-12-20 00:56:25 +0000
4@@ -715,7 +715,6 @@
5 Loader {
6 id: keyboardLoader
7 width: parent.width
8- asynchronous: true
9 source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
10 opacity: ((y + height) >= scrollableView.contentY) &&
11 (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0

Subscribers

People subscribed via source and target branches