git.iko.soy/unity8
on xenial help sign in
treat the dash more like a regular app
commit365ca1e04fa9409cefbeece1b0f58c43cc8cf987 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 4 Apr 2017, 18:43 (10 years ago) parente368815
4 files changed+7−11
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+1−1 qml/Shell.qml+2−3 qml/Stage/Stage.qml+3−5 qml/Tutorial/TutorialContent.qml+1−2
qml/Greeter/Greeter.qml+1−1
@@ -102,7 +102,7 @@ Showable {
102102 show();
103103 d.startUnlock(false /* toTheRight */);
104104 }
105− } else if (appId !== "unity8-dash") { // dash isn't started by user
105+ } else {
106106 d.startUnlock(false /* toTheRight */);
107107 }
108108 }
qml/Shell.qml+2−3
@@ -110,7 +110,7 @@ StyledItem {
110110 }
111111 }
112112 function _onMainAppChanged(appId) {
113− if (wizard.active && appId != "" && appId != "unity8-dash") {
113+ if (wizard.active && appId != "") {
114114 // If this happens on first boot, we may be in the
115115 // wizard while receiving a call. But a call is more
116116 // important than the wizard so just bail out of it.
@@ -241,8 +241,7 @@ StyledItem {
241241 onHomeKeyActivated: {
242242 // Ignore when greeter is active, to avoid pocket presses
243243 if (!greeter.active) {
244− launcher.fadeOut();
245− ApplicationManager.requestFocusApplication("unity8-dash");
244+ launcher.openDrawer(false);
246245 }
247246 }
248247 onTouchBegun: { cursor.opacity = 0; }
qml/Stage/Stage.qml+3−5
@@ -606,9 +606,7 @@ FocusScope {
606606 }
607607
608608 onCloseCurrentApp: {
609− if (!appRepeater.itemAt(highlightedIndex).isDash) {
610− appRepeater.itemAt(highlightedIndex).close();
611− }
609+ appRepeater.itemAt(highlightedIndex).close();
612610 }
613611 }
614612
@@ -1741,7 +1739,7 @@ FocusScope {
17411739 objectName: "dragArea"
17421740 anchors.fill: decoratedWindow
17431741 enabled: false
1744− closeable: !appDelegate.isDash
1742+ closeable: true
17451743
17461744 onClicked: {
17471745 spreadItem.highlightedIndex = index;
@@ -1784,7 +1782,7 @@ FocusScope {
17841782 objectName: "closeMouseArea"
17851783 anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
17861784 readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
1787− visible: !appDelegate.isDash && dragArea.distance == 0
1785+ visible: dragArea.distance == 0
17881786 && index == spreadItem.highlightedIndex
17891787 && mousePos.y < (decoratedWindow.height / 3)
17901788 && mousePos.y > -units.gu(4)
qml/Tutorial/TutorialContent.qml+1−2
@@ -153,8 +153,7 @@ Item {
153153 paused: root.paused
154154
155155 skipped: tutorialLeftLongLoader.skipped
156− isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed &&
157− ApplicationManager.focusedApplicationId != "unity8-dash"
156+ isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed
158157
159158 InactivityTimer {
160159 id: tutorialLeftLongTimer