git.iko.soy/unity8
on xenial help sign in
Fixed incorrect osk surface item resizing the surface.
c714565Nick Dedekind
qml/Components/InputMethod.qml+2−2
compare with xenial
unifiedsplit
@@ -30,8 +30,8 @@ Item {
30
30
31 consumesInput: true
31 consumesInput: true
32
32
33− surfaceWidth: width
33+ surfaceWidth: root.enabled ? width : -1
34− surfaceHeight: height
34+ surfaceHeight: root.enabled ? height : -1
35 surface: SurfaceManager.inputMethodSurface
35 surface: SurfaceManager.inputMethodSurface
36
36
37 onLiveChanged: {
37 onLiveChanged: {
qml/DisabledScreenNotice.qml+7
@@ -18,6 +18,7 @@ import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Unity.Session 0.1
20import Unity.Session 0.1
21+import Unity.Screens 0.1
21import QtQuick.Window 2.2
22import QtQuick.Window 2.2
22import "Components"
23import "Components"
23
24
@@ -35,6 +36,10 @@ Item {
35 name: applicationArguments.deviceName
36 name: applicationArguments.deviceName
36 }
37 }
37
38
39+ Screens {
40+ id: screens
41+ }
42+
38 Item {
43 Item {
39 id: contentContainer
44 id: contentContainer
40 objectName: "contentContainer"
45 objectName: "contentContainer"
@@ -119,6 +124,8 @@ Item {
119
124
120 InputMethod {
125 InputMethod {
121 id: inputMethod
126 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
122 objectName: "inputMethod"
129 objectName: "inputMethod"
123 anchors.fill: parent
130 anchors.fill: parent
124 }
131 }