0a79eb0 · unity8 · git.iko.soy

qml/Components/InputMethod.qml+2−3

compare with xenial

unifiedsplit

@@ -22,7 +22,6 @@ import Ubuntu.Gestures 0.1

22Item {

23 id: root

24

25− property bool active: false

26 property int transitionDuration: UbuntuAnimation.FastDuration

25 property int transitionDuration: UbuntuAnimation.FastDuration

27

26

28 MirSurfaceItem {

27 MirSurfaceItem {

@@ -31,8 +30,8 @@ Item {

31

30

32 consumesInput: true

31 consumesInput: true

33

32

34− surfaceWidth: root.active ? width : -1

33+ surfaceWidth: root.enabled ? width : -1

35− surfaceHeight: root.active ? height : -1

34+ surfaceHeight: root.enabled ? height : -1

36 surface: SurfaceManager.inputMethodSurface

35 surface: SurfaceManager.inputMethodSurface

37

36

38 onLiveChanged: {

37 onLiveChanged: {

qml/DisabledScreenNotice.qml+2−1

@@ -124,7 +124,8 @@ Item {

124

125 InputMethod {

126 id: inputMethod

127+ // Make sure we don't resize the input method if we dont have a secondary screen.

127− active: screens.count > 1

128+ enabled: screens.count > 1

128 objectName: "inputMethod"

129 objectName: "inputMethod"

129 anchors.fill: parent

130 anchors.fill: parent

130 }

131 }

qml/Shell.qml−1

@@ -392,7 +392,6 @@ Item {

392 InputMethod {

393 id: inputMethod

394 objectName: "inputMethod"

395− active: oskEnabled

396 anchors {

395 anchors {

397 fill: parent

396 fill: parent

398 topMargin: panel.panelHeight

397 topMargin: panel.panelHeight