git.iko.soy/unity8
on xenial help sign in
In tablet mode, shell also needs to update app interactive/focus state
97b41f2Gerry Boland
qml/Stages/TabletStage.qml+3−1
compare with xenial
unifiedsplit
@@ -36,6 +36,7 @@ Item {
36 readonly property bool painting: true
36 readonly property bool painting: true
37 property bool fullscreen: true
37 property bool fullscreen: true
38 property bool overlayMode: false
38 property bool overlayMode: false
39+ property bool interactive
39
40
40 readonly property int overlayWidth: priv.overlayOverride ? 0 : spreadView.sideStageWidth
41 readonly property int overlayWidth: priv.overlayOverride ? 0 : spreadView.sideStageWidth
41
42
@@ -434,7 +435,8 @@ Item {
434 selected: spreadView.selectedIndex == index
435 selected: spreadView.selectedIndex == index
435 otherSelected: spreadView.selectedIndex >= 0 && !selected
436 otherSelected: spreadView.selectedIndex >= 0 && !selected
436 isInSideStage: priv.sideStageAppId == model.appId
437 isInSideStage: priv.sideStageAppId == model.appId
437− interactive: !spreadView.interactive
438+ interactive: !spreadView.interactive && spreadView.phase === 0 && root.interactive
439+ swipeToCloseEnabled: spreadView.interactive
438 maximizedAppTopMargin: root.maximizedAppTopMargin
440 maximizedAppTopMargin: root.maximizedAppTopMargin
439 dropShadow: spreadView.contentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided
441 dropShadow: spreadView.contentX > 0 || spreadDragArea.status == DirectionalDragArea.Undecided
440
442