git.iko.soy/unity8
on xenial help sign in
reverted interactive use for consumes Input
commitf0981dfd6c14c9157ffa17a1decb631af1aa9fbc authorNick Dedekind <nick.dedekind@canonical.com> dateMon 9 May 2016, 09:34 (10 years ago) parent388806a
2 files changed+3−1
compare with xenial
unifiedsplit
qml/Stages/SurfaceContainer.qml+2−1 qml/Stages/TabletStage.qml+1
qml/Stages/SurfaceContainer.qml+2−1
@@ -34,6 +34,7 @@ FocusScope {
3434 property int surfaceOrientationAngle: 0
3535 property bool resizeSurface: true
3636 property bool inPromptSession: false
37+ property alias consumesInput: surfaceItem.consumesInput
3738
3839 onSurfaceChanged: {
3940 // Not a binding because animations might remove the surface from the surfaceItem
@@ -57,7 +58,7 @@ FocusScope {
5758 objectName: "surfaceItem"
5859
5960 fillMode: MirSurfaceItem.PadOrCrop
60− consumesInput: root.interactive
61+ consumesInput: true
6162
6263 surfaceWidth: {
6364 if (root.resizeSurface) {
qml/Stages/TabletStage.qml+1
@@ -1073,6 +1073,7 @@ AbstractStage {
10731073
10741074 surface: spreadDelegate ? spreadDelegate.surface : null
10751075
1076+ consumesInput: false
10761077 interactive: false
10771078 resizeSurface: false
10781079 focus: false