git.iko.soy/unity8
on xenial help sign in
Merged with prerequisite.
commitb29be15dc4c96461cf48141f78881c0ac9dc3f74 authorLeo Arias <leo.arias@canonical.com> dateThu 31 Jul 2014, 17:56 (12 years ago) parent62fce76873e6a4
3 files changed+20−5
compare with xenial
unifiedsplit
qml/Dash/DashApplication.qml+16 qml/Shell.qml+3−4 qml/Stages/PhoneStage.qml+1−1
qml/Dash/DashApplication.qml+16
@@ -1,3 +1,19 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
117import QtQuick 2.2
218import Ubuntu.Components 1.0
319
qml/Shell.qml+3−4
@@ -434,14 +434,13 @@ Item {
434434 if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
435435 return;
436436 }
437−
438− ApplicationManager.requestFocusApplication("unity8-dash")
439− launcher.fadeOut();
440−
441437 if (greeter.shown) {
442438 greeter.hideRight();
443439 launcher.fadeOut();
444440 }
441+
442+ ApplicationManager.requestFocusApplication("unity8-dash")
443+ launcher.fadeOut();
445444 }
446445
447446 Item {
qml/Stages/PhoneStage.qml+1−1
@@ -353,7 +353,7 @@ Rectangle {
353353
354354 // Hiding tiles when their progress is negative or reached the maximum
355355 visible: (progress >= 0 && progress < 1.7) ||
356− (model.appId == "unity8-dash" && priv.focusedAppDelegate.x !== 0)
356+ (isDash && priv.focusedAppDelegate.x !== 0)
357357
358358 EasingCurve {
359359 id: snappingCurve