git.iko.soy/unity8
on xenial help sign in
also drop the leftEdge dragging in the stage
commit57306f8e8cb3f1c6e19536225bebed5e69376107 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 14 Nov 2016, 17:56 (10 years ago) parent1816c2e
3 files changed+2−11
compare with xenial
unifiedsplit
qml/Shell.qml−2 qml/Stage/Stage.qml−2 qml/Stage/StageMaths.qml+2−7
qml/Shell.qml−2
@@ -278,8 +278,6 @@ StyledItem {
278278
279279 dragAreaWidth: shell.edgeSize
280280 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)
283281
284282 applicationManager: ApplicationManager
285283 topLevelSurfaceList: topLevelSurfaceList
qml/Stage/Stage.qml−2
@@ -49,7 +49,6 @@ FocusScope {
4949
5050 // Configuration
5151 property string mode: "staged"
52− property real leftEdgeDragProgress: 0
5352
5453 // Used by the tutorial code
5554 readonly property bool spreadShown: state == "spread"
@@ -998,7 +997,6 @@ FocusScope {
998997 sideStageX: sideStage.x
999998 itemIndex: appDelegate.itemIndex
1000999 nextInStack: priv.nextInStack
1001− leftEdgeDragProgress: root.leftEdgeDragProgress
10021000 }
10031001
10041002 StagedRightEdgeMaths {
qml/Stage/StageMaths.qml+2−7
@@ -12,7 +12,6 @@ QtObject {
1212 property int sideStageWidth: 0
1313 property int sideStageX: sceneWidth
1414 property bool animateX: false
15− property int leftEdgeDragProgress: 0
1615
1716 property int stage: ApplicationInfoInterface.MainStage
1817 property var thisDelegate: null
@@ -26,10 +25,6 @@ QtObject {
2625 // of the last focused order.
2726 readonly property int itemZ: {
2827 // 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−
3328 if (!sideStageDelegate) return itemIndex;
3429
3530 // don't shuffle indexes greater than "actives or next"
@@ -64,12 +59,12 @@ QtObject {
6459
6560 property int itemX: {
6661 if (mainStageDelegate == thisDelegate) {
67− return thisDelegate.isDash ? 0 : leftEdgeDragProgress;
62+ return 0
6863 }
6964 if (sideStageDelegate == thisDelegate) {
7065 return sideStageX;
7166 }
72− return thisDelegate.isDash && leftEdgeDragProgress > 0 ? 0 : sceneWidth;
67+ return sceneWidth;
7368 }
7469 Behavior on itemX { enabled: root.animateX; UbuntuNumberAnimation {} }
7570