git.iko.soy/unity8
on xenial help sign in
Fixed mutiple screen input method resize
63179f0Nick Dedekind
qml/Components/InputMethod.qml+3−2
compare with xenial
unifiedsplit
@@ -22,6 +22,7 @@ import Ubuntu.Gestures 0.1
22Item {
22Item {
23 id: root
23 id: root
24
24
25+ property bool active: false
25 property int transitionDuration: UbuntuAnimation.FastDuration
26 property int transitionDuration: UbuntuAnimation.FastDuration
26
27
27 MirSurfaceItem {
28 MirSurfaceItem {
@@ -30,8 +31,8 @@ Item {
30
31
31 consumesInput: true
32 consumesInput: true
32
33
33− surfaceWidth: width
34+ surfaceWidth: root.active ? width : -1
34− surfaceHeight: height
35+ surfaceHeight: root.active ? height : -1
35 surface: SurfaceManager.inputMethodSurface
36 surface: SurfaceManager.inputMethodSurface
36
37
37 onLiveChanged: {
38 onLiveChanged: {
qml/DisabledScreenNotice.qml+6
@@ -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,7 @@ Item {
119
124
120 InputMethod {
125 InputMethod {
121 id: inputMethod
126 id: inputMethod
127+ active: screens.count > 1
122 objectName: "inputMethod"
128 objectName: "inputMethod"
123 anchors.fill: parent
129 anchors.fill: parent
124 }
130 }
qml/Shell.qml+1
@@ -392,6 +392,7 @@ Item {
392 InputMethod {
392 InputMethod {
393 id: inputMethod
393 id: inputMethod
394 objectName: "inputMethod"
394 objectName: "inputMethod"
395+ active: oskEnabled
395 anchors {
396 anchors {
396 fill: parent
397 fill: parent
397 topMargin: panel.panelHeight
398 topMargin: panel.panelHeight