~ci-train-bot/unity8/unity8-ubuntu-zesty-2663

« back to all changes in this revision

Viewing changes to qml/Shell.qml

  • Committer: Nick Dedekind
  • Date: 2017-03-15 15:22:07 UTC
  • mfrom: (2868 unity8)
  • mto: This revision was merged to the branch mainline in revision 2892.
  • Revision ID: nick.dedekind@canonical.com-20170315152207-9ts6lyu1v2pruue2
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
72
72
    }
73
73
    property bool hasMouse: false
74
74
    property bool hasKeyboard: false
 
75
    property bool hasTouchscreen: false
75
76
 
76
77
    // to be read from outside
77
78
    readonly property int mainAppWindowOrientationAngle: stage.mainAppWindowOrientationAngle
549
550
            fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)
550
551
                            || greeter.hasLockedApp
551
552
            greeterShown: greeter && greeter.shown
 
553
            hasKeyboard: shell.hasKeyboard
552
554
            panelState: panelState
553
555
        }
554
556
 
644
646
            objectName: "tutorial"
645
647
            anchors.fill: parent
646
648
 
647
 
            paused: callManager.hasCalls || !greeter || greeter.active ||
648
 
                    wizard.active
 
649
            paused: callManager.hasCalls || !greeter || greeter.active || wizard.active
 
650
                    || !hasTouchscreen // TODO #1661557 something better for no touchscreen
649
651
            delayed: dialogs.hasActiveDialog || notifications.hasNotification ||
650
652
                     inputMethod.visible ||
651
653
                     (launcher.shown && !launcher.lockedVisible) ||