← Back to branch summary

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

« back to all changes in this revision

Viewing changes to qml/Shell.qml

  • Committer: Nick Dedekind
  • Date: 2016-11-28 13:46:55 UTC
  • mfrom: (2704 unity8)
  • mto: This revision was merged to the branch mainline in revision 2752.
  • Revision ID: nick.dedekind@canonical.com-20161128134655-vd70a64pbci1b4oc
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Shell.qml
140
140
        id: wallpaperResolver
141
141
        objectName: "wallpaperResolver"
142
142
 
143
 
        readonly property url defaultBackground: "file:///usr/share/backgrounds/warty-final-ubuntu.png"
 
143
        readonly property url defaultBackground: "file://" + Constants.defaultWallpaper
144
144
        readonly property bool hasCustomBackground: background != defaultBackground
145
145
 
146
146
        // Use a cached version of the scaled-down wallpaper (as sometimes the
447
447
        }
448
448
 
449
449
        if (!greeter.locked && tutorial.launcherLongSwipeEnabled
450
 
            && ApplicationManager.focusedApplicationId != "unity8-dash") {
 
450
            && (ApplicationManager.focusedApplicationId != "unity8-dash" || stage.spreadShown)) {
451
451
            ApplicationManager.requestFocusApplication("unity8-dash")
452
452
            launcher.fadeOut();
 
453
            stage.closeSpread();
453
454
        }
454
455
    }
455
456
 
524
525
                    && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
525
526
                    && !greeter.hasLockedApp
526
527
                    && !shell.waitingOnGreeter
 
528
                    && settings.enableLauncher
527
529
            inverted: shell.usageScenario !== "desktop"
528
530
            superPressed: physicalKeysMapper.superPressed
529
531
            superTabPressed: physicalKeysMapper.superTabPressed