← Back to branch summary

~mterry/+junk/fp

« back to all changes in this revision

Viewing changes to qml/Shell.qml

  • Committer: Michael Terry
  • Date: 2016-06-20 16:25:15 UTC
  • Revision ID: michael.terry@canonical.com-20160620162515-3ogol2bsx5zxp0ki
Disable fingerprints when dialog/fullscreen-notification/indicators are up

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Shell.qml
421
421
            launcherOffset: launcher.progress
422
422
            forcedUnlock: wizard.active || shell.mode === "full-shell"
423
423
            background: wallpaperResolver.background
 
424
            allowFingerprint: !dialogs.hasActiveDialog &&
 
425
                              !notifications.topmostIsFullscreen &&
 
426
                              !panel.indicators.shown
424
427
 
425
428
            // avoid overlapping with Launcher's edge drag area
426
429
            // FIXME: Fix TouchRegistry & friends and remove this workaround