git.iko.soy/unity8
on xenial help sign in
also drop the leftEdge dragging in the stage
57306f8Michael Zanetti
qml/Shell.qml−2
compare with xenial
unifiedsplit
@@ -278,8 +278,6 @@ StyledItem {
278
278
279 dragAreaWidth: shell.edgeSize
279 dragAreaWidth: shell.edgeSize
280 background: wallpaperResolver.background
280 background: wallpaperResolver.background
281−// leftEdgeDragProgress: !greeter || greeter.locked || !tutorial.launcherLongSwipeEnabled ? 0 :
282−// Math.max(0, (launcher.dragDistance * (stage.width - launcher.panelWidth) / stage.width) - launcher.panelWidth)
283
281
284 applicationManager: ApplicationManager
282 applicationManager: ApplicationManager
285 topLevelSurfaceList: topLevelSurfaceList
283 topLevelSurfaceList: topLevelSurfaceList
qml/Stage/Stage.qml−2
@@ -49,7 +49,6 @@ FocusScope {
49
49
50 // Configuration
50 // Configuration
51 property string mode: "staged"
51 property string mode: "staged"
52− property real leftEdgeDragProgress: 0
53
52
54 // Used by the tutorial code
53 // Used by the tutorial code
55 readonly property bool spreadShown: state == "spread"
54 readonly property bool spreadShown: state == "spread"
@@ -998,7 +997,6 @@ FocusScope {
998 sideStageX: sideStage.x
997 sideStageX: sideStage.x
999 itemIndex: appDelegate.itemIndex
998 itemIndex: appDelegate.itemIndex
1000 nextInStack: priv.nextInStack
999 nextInStack: priv.nextInStack
1001− leftEdgeDragProgress: root.leftEdgeDragProgress
1002 }
1000 }
1003
1001
1004 StagedRightEdgeMaths {
1002 StagedRightEdgeMaths {
qml/Stage/StageMaths.qml+2−7
@@ -12,7 +12,6 @@ QtObject {
12 property int sideStageWidth: 0
12 property int sideStageWidth: 0
13 property int sideStageX: sceneWidth
13 property int sideStageX: sceneWidth
14 property bool animateX: false
14 property bool animateX: false
15− property int leftEdgeDragProgress: 0
16
15
17 property int stage: ApplicationInfoInterface.MainStage
16 property int stage: ApplicationInfoInterface.MainStage
18 property var thisDelegate: null
17 property var thisDelegate: null
@@ -26,10 +25,6 @@ QtObject {
26 // of the last focused order.
25 // of the last focused order.
27 readonly property int itemZ: {
26 readonly property int itemZ: {
28 // only shuffle when we've got a main and side stage
27 // only shuffle when we've got a main and side stage
29− if (thisDelegate.isDash && thisDelegate != mainStageDelegate && leftEdgeDragProgress > 0) {
30− return -1; // Keep the dash behind all other apps for the left edge gesture
31− }
32−
33 if (!sideStageDelegate) return itemIndex;
28 if (!sideStageDelegate) return itemIndex;
34
29
35 // don't shuffle indexes greater than "actives or next"
30 // don't shuffle indexes greater than "actives or next"
@@ -64,12 +59,12 @@ QtObject {
64
59
65 property int itemX: {
60 property int itemX: {
66 if (mainStageDelegate == thisDelegate) {
61 if (mainStageDelegate == thisDelegate) {
67− return thisDelegate.isDash ? 0 : leftEdgeDragProgress;
62+ return 0
68 }
63 }
69 if (sideStageDelegate == thisDelegate) {
64 if (sideStageDelegate == thisDelegate) {
70 return sideStageX;
65 return sideStageX;
71 }
66 }
72− return thisDelegate.isDash && leftEdgeDragProgress > 0 ? 0 : sceneWidth;
67+ return sceneWidth;
73 }
68 }
74 Behavior on itemX { enabled: root.animateX; UbuntuNumberAnimation {} }
69 Behavior on itemX { enabled: root.animateX; UbuntuNumberAnimation {} }
75
70