ubuntu-keyboard

Merge lp:~michael-sheldon/ubuntu-keyboard/fix-upside-down-height into lp:ubuntu-keyboard

  1. fix-upside-down-height
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 321
Merged at revision: 327
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-upside-down-height
Merge into: lp:ubuntu-keyboard
Diff against target: 16 lines (+5/-1)
1 file modified
qml/Keyboard.qml (+5/-1)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-upside-down-height
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+250147@code.launchpad.net

Commit message

Fix reporting of keyboard height when in inverted portrait orientation

Description of the change

Fix reporting of keyboard height when in inverted portrait orientation

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/558/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/59
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18162

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/558/rebuild

review: Needs Fixing (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 2015-02-09 14:46:50 +0000
3+++ qml/Keyboard.qml 2015-02-18 14:58:43 +0000
4@@ -304,7 +304,11 @@
5
6 var obj = mapFromItem(keyboardSurface, vx, vy, vwidth, vheight);
7 // Report visible height of the keyboard to support anchorToKeyboard
8- obj.height = fullScreenItem.height - obj.y;
9+ if (canvas.contentOrientation == Qt.InvertedPortraitOrientation) {
10+ obj.height += obj.y
11+ } else {
12+ obj.height = fullScreenItem.height - obj.y;
13+ }
14
15 // Work around QT bug: https://bugreports.qt-project.org/browse/QTBUG-20435
16 // which results in a 0 height being reported incorrectly immediately prior

Subscribers

People subscribed via source and target branches