use enabled
commit0a79eb0fdd1169b1ebc07c3c036a3d3c1d4ad51e
authorNick Dedekind <nick.dedekind@canonical.com>
dateThu 5 May 2016, 18:20 (10 years ago)
parent63179f0
qml/Components/InputMethod.qml+2−3
@@ -22,7 +22,6 @@ import Ubuntu.Gestures 0.1
2222Item {
2323 id: root
2424
25− property bool active: false
2625 property int transitionDuration: UbuntuAnimation.FastDuration
2726
2827 MirSurfaceItem {
@@ -31,8 +30,8 @@ Item {
3130
3231 consumesInput: true
3332
34− surfaceWidth: root.active ? width : -1
35− surfaceHeight: root.active ? height : -1
33+ surfaceWidth: root.enabled ? width : -1
34+ surfaceHeight: root.enabled ? height : -1
3635 surface: SurfaceManager.inputMethodSurface
3736
3837 onLiveChanged: {
qml/DisabledScreenNotice.qml+2−1
@@ -124,7 +124,8 @@ Item {
124124
125125 InputMethod {
126126 id: inputMethod
127− active: screens.count > 1
127+ // Make sure we don't resize the input method if we dont have a secondary screen.
128+ enabled: screens.count > 1
128129 objectName: "inputMethod"
129130 anchors.fill: parent
130131 }
qml/Shell.qml−1
@@ -392,7 +392,6 @@ Item {
392392 InputMethod {
393393 id: inputMethod
394394 objectName: "inputMethod"
395− active: oskEnabled
396395 anchors {
397396 fill: parent
398397 topMargin: panel.panelHeight