b29be15 · unity8 · git.iko.soy

qml/Dash/DashApplication.qml+16

compare with xenial

unifiedsplit

@@ -1,3 +1,19 @@

1+/*

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+

1import QtQuick 2.2

17import QtQuick 2.2

2import Ubuntu.Components 1.0

18import Ubuntu.Components 1.0

3

19

qml/Shell.qml+3−4

@@ -434,14 +434,13 @@ Item {

434 if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {

435 return;

436 }

437−

438− ApplicationManager.requestFocusApplication("unity8-dash")

439− launcher.fadeOut();

440−

441 if (greeter.shown) {

437 if (greeter.shown) {

442 greeter.hideRight();

438 greeter.hideRight();

443 launcher.fadeOut();

439 launcher.fadeOut();

444 }

440 }

441+

442+ ApplicationManager.requestFocusApplication("unity8-dash")

443+ launcher.fadeOut();

445 }

444 }

446

445

447 Item {

446 Item {

qml/Stages/PhoneStage.qml+1−1

@@ -353,7 +353,7 @@ Rectangle {

353

354 // Hiding tiles when their progress is negative or reached the maximum

355 visible: (progress >= 0 && progress < 1.7) ||

356− (model.appId == "unity8-dash" && priv.focusedAppDelegate.x !== 0)

356+ (isDash && priv.focusedAppDelegate.x !== 0)

357

358 EasingCurve {

359 id: snappingCurve