git.iko.soy/unity8
on xenial help sign in
fix edge pushing
9305ba7Michael Zanetti
qml/Launcher/Launcher.qml+1−1
compare with xenial
unifiedsplit
@@ -133,7 +133,7 @@ FocusScope {
133 }
133 }
134
134
135 function pushEdge(amount) {
135 function pushEdge(amount) {
136− if (root.state === "" || root.state == "visible") {
136+ if (root.state === "" || root.state == "visible" || root.state == "visibleTemporary") {
137 edgeBarrier.push(amount);
137 edgeBarrier.push(amount);
138 }
138 }
139 }
139 }
qml/Stage/Stage.qml+2−2
@@ -471,7 +471,7 @@ FocusScope {
471 visible: true
471 visible: true
472 blurRadius: 32
472 blurRadius: 32
473 brightness: .65
473 brightness: .65
474− opacity: MathUtils.linearAnimation(spreadItem.rightEdgeBreakPoint, 1, 0, 1, Math.max(rightEdgeDragArea.progress, edgeBarrier.progress))
474+ opacity: MathUtils.linearAnimation(spreadItem.rightEdgeBreakPoint, 1, 0, 1, Math.max(rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0, edgeBarrier.progress))
475 }
475 }
476 },
476 },
477 State {
477 State {
@@ -1156,7 +1156,7 @@ FocusScope {
1156 when: root.mode == "windowed" && (root.state == "windowedRightEdge" || rightEdgeFocusAnimation.running || hidingAnimation.running || edgeBarrier.progress > 0)
1156 when: root.mode == "windowed" && (root.state == "windowedRightEdge" || rightEdgeFocusAnimation.running || hidingAnimation.running || edgeBarrier.progress > 0)
1157 PropertyChanges {
1157 PropertyChanges {
1158 target: windowedRightEdgeMaths
1158 target: windowedRightEdgeMaths
1159− progress: Math.max(rightEdgeDragArea.progress, edgeBarrier.progress)
1159+ progress: Math.max(rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0, edgeBarrier.progress)
1160 }
1160 }
1161 PropertyChanges {
1161 PropertyChanges {
1162 target: appDelegate
1162 target: appDelegate