on xenial help sign in
Fixed incorrect osk surface item resizing the surface.

Approved by: Daniel d'Andrada

commitc7145658fa2552bcdbdf1641e0436cd14a95eb6d authorNick Dedekind <nick.dedekind@canonical.com> dateFri 20 May 2016, 08:43 (10 years ago) parent0365d75725317c
2 files changed+9−2
qml/Components/InputMethod.qml+2−2 qml/DisabledScreenNotice.qml+7
qml/Components/InputMethod.qml+2−2
@@ -30,8 +30,8 @@ Item {
3030
3131 consumesInput: true
3232
33− surfaceWidth: width
34− surfaceHeight: height
33+ surfaceWidth: root.enabled ? width : -1
34+ surfaceHeight: root.enabled ? height : -1
3535 surface: SurfaceManager.inputMethodSurface
3636
3737 onLiveChanged: {
qml/DisabledScreenNotice.qml+7
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.3
2020import Unity.Session 0.1
21+import Unity.Screens 0.1
2122import QtQuick.Window 2.2
2223import "Components"
2324
@@ -35,6 +36,10 @@ Item {
3536 name: applicationArguments.deviceName
3637 }
3738
39+ Screens {
40+ id: screens
41+ }
42+
3843 Item {
3944 id: contentContainer
4045 objectName: "contentContainer"
@@ -119,6 +124,8 @@ Item {
119124
120125 InputMethod {
121126 id: inputMethod
127+ // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.
128+ enabled: screens.count > 1
122129 objectName: "inputMethod"
123130 anchors.fill: parent
124131 }