← Back to branch summary

~mzanetti/unity8/fix-resize-bug

« back to all changes in this revision

Viewing changes to qml/Stage/Stage.qml

  • Committer: Michael Zanetti
  • Date: 2016-10-05 13:47:04 UTC
  • Revision ID: michael.zanetti@canonical.com-20161005134704-kw2fo69itqp3kva9
fix focusing in windowed mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stage/Stage.qml
228
228
            }
229
229
        }
230
230
 
231
 
        readonly property bool sideStageEnabled: root.shellOrientation == Qt.LandscapeOrientation ||
232
 
                                                 root.shellOrientation == Qt.InvertedLandscapeOrientation
 
231
        readonly property bool sideStageEnabled: root.mode === "stagedWithSideStage" &&
 
232
                                                 (root.shellOrientation == Qt.LandscapeOrientation ||
 
233
                                                 root.shellOrientation == Qt.InvertedLandscapeOrientation)
233
234
 
234
235
        property var mainStageDelegate: null
235
236
        property var sideStageDelegate: null
913
914
                            rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
914
915
                            rightEdgeFocusAnimation.start()
915
916
                        }
916
 
                    } else if (state == "windowedRightEdge") {
 
917
                    } else if (state == "windowedRightEdge" || state == "windowed") {
917
918
                        claimFocus();
918
919
                    } else {
919
920
                        focusAnimation.start()