git.iko.soy/unity8
on xenial help sign in
treat the dash more like a regular app
365ca1eMichael Zanetti
qml/Greeter/Greeter.qml+1−1
compare with xenial
unifiedsplit
@@ -102,7 +102,7 @@ Showable {
102 show();
102 show();
103 d.startUnlock(false /* toTheRight */);
103 d.startUnlock(false /* toTheRight */);
104 }
104 }
105− } else if (appId !== "unity8-dash") { // dash isn't started by user
105+ } else {
106 d.startUnlock(false /* toTheRight */);
106 d.startUnlock(false /* toTheRight */);
107 }
107 }
108 }
108 }
qml/Shell.qml+2−3
@@ -110,7 +110,7 @@ StyledItem {
110 }
110 }
111 }
111 }
112 function _onMainAppChanged(appId) {
112 function _onMainAppChanged(appId) {
113− if (wizard.active && appId != "" && appId != "unity8-dash") {
113+ if (wizard.active && appId != "") {
114 // If this happens on first boot, we may be in the
114 // If this happens on first boot, we may be in the
115 // wizard while receiving a call. But a call is more
115 // wizard while receiving a call. But a call is more
116 // important than the wizard so just bail out of it.
116 // important than the wizard so just bail out of it.
@@ -241,8 +241,7 @@ StyledItem {
241 onHomeKeyActivated: {
241 onHomeKeyActivated: {
242 // Ignore when greeter is active, to avoid pocket presses
242 // Ignore when greeter is active, to avoid pocket presses
243 if (!greeter.active) {
243 if (!greeter.active) {
244− launcher.fadeOut();
244+ launcher.openDrawer(false);
245− ApplicationManager.requestFocusApplication("unity8-dash");
246 }
245 }
247 }
246 }
248 onTouchBegun: { cursor.opacity = 0; }
247 onTouchBegun: { cursor.opacity = 0; }
qml/Stage/Stage.qml+3−5
@@ -606,9 +606,7 @@ FocusScope {
606 }
606 }
607
607
608 onCloseCurrentApp: {
608 onCloseCurrentApp: {
609− if (!appRepeater.itemAt(highlightedIndex).isDash) {
610− appRepeater.itemAt(highlightedIndex).close();
609+ appRepeater.itemAt(highlightedIndex).close();
611− }
612 }
610 }
613 }
611 }
614
612
@@ -1741,7 +1739,7 @@ FocusScope {
1741 objectName: "dragArea"
1739 objectName: "dragArea"
1742 anchors.fill: decoratedWindow
1740 anchors.fill: decoratedWindow
1743 enabled: false
1741 enabled: false
1744− closeable: !appDelegate.isDash
1742+ closeable: true
1745
1743
1746 onClicked: {
1744 onClicked: {
1747 spreadItem.highlightedIndex = index;
1745 spreadItem.highlightedIndex = index;
@@ -1784,7 +1782,7 @@ FocusScope {
1784 objectName: "closeMouseArea"
1782 objectName: "closeMouseArea"
1785 anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
1783 anchors { left: parent.left; top: parent.top; leftMargin: -height / 2; topMargin: -height / 2 + spreadMaths.closeIconOffset }
1786 readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
1784 readonly property var mousePos: hoverMouseArea.mapToItem(appDelegate, hoverMouseArea.mouseX, hoverMouseArea.mouseY)
1787− visible: !appDelegate.isDash && dragArea.distance == 0
1785+ visible: dragArea.distance == 0
1788 && index == spreadItem.highlightedIndex
1786 && index == spreadItem.highlightedIndex
1789 && mousePos.y < (decoratedWindow.height / 3)
1787 && mousePos.y < (decoratedWindow.height / 3)
1790 && mousePos.y > -units.gu(4)
1788 && mousePos.y > -units.gu(4)
qml/Tutorial/TutorialContent.qml+1−2
@@ -153,8 +153,7 @@ Item {
153 paused: root.paused
153 paused: root.paused
154
154
155 skipped: tutorialLeftLongLoader.skipped
155 skipped: tutorialLeftLongLoader.skipped
156− isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed &&
156+ isReady: tutorialTopLoader.skipped && !skipped && !paused && !delayed
157− ApplicationManager.focusedApplicationId != "unity8-dash"
158
157
159 InactivityTimer {
158 InactivityTimer {
160 id: tutorialLeftLongTimer
159 id: tutorialLeftLongTimer