git.iko.soy/unity8
on xenial help sign in
fix focusing in windowed mode
5054cbbMichael Zanetti
qml/Stage/Stage.qml+4−3
compare with xenial
unifiedsplit
@@ -228,8 +228,9 @@ FocusScope {
228 }
228 }
229 }
229 }
230
230
231+ readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
231− readonly property bool sideStageEnabled: root.shellOrientation == Qt.LandscapeOrientation ||
232+ (root.shellOrientation == Qt.LandscapeOrientation ||
232− root.shellOrientation == Qt.InvertedLandscapeOrientation
233+ root.shellOrientation == Qt.InvertedLandscapeOrientation)
233
234
234 property var mainStageDelegate: null
235 property var mainStageDelegate: null
235 property var sideStageDelegate: null
236 property var sideStageDelegate: null
@@ -913,7 +914,7 @@ FocusScope {
913 rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
914 rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
914 rightEdgeFocusAnimation.start()
915 rightEdgeFocusAnimation.start()
915 }
916 }
916− } else if (state == "windowedRightEdge") {
917+ } else if (state == "windowedRightEdge" || state == "windowed") {
917 claimFocus();
918 claimFocus();
918 } else {
919 } else {
919 focusAnimation.start()
920 focusAnimation.start()