Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1413765-rtm into lp:ubuntu-system-settings-online-accounts/rtm-14.09

Proposed by Alberto Mardegan
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 206
Merged at revision: 206
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/lp1413765-rtm
Merge into: lp:ubuntu-system-settings-online-accounts/rtm-14.09
Diff against target: 13 lines (+1/-2)
1 file modified
plugins/module/OAuth.qml (+1/-2)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1413765-rtm
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
Review via email: mp+248540@code.launchpad.net

Commit message

Anchor the webview directly to the OSK

Description of the change

Anchor the webview directly to the OSK

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/module/OAuth.qml'
2--- plugins/module/OAuth.qml 2014-06-10 14:48:22 +0000
3+++ plugins/module/OAuth.qml 2015-02-04 12:43:00 +0000
4@@ -130,8 +130,7 @@
5 top: parent.top
6 left: parent.left
7 right: parent.right
8- bottom: cancelButton.top
9- bottomMargin: Math.max(osk.height - cancelButton.height, 0)
10+ bottom: Qt.inputMethod.visible ? osk.top : cancelButton.top
11 }
12 focus: true
13 visible: !loading

Subscribers

People subscribed via source and target branches