git.iko.soy/unity8
on xenial help sign in
fix edge pushing
commit9305ba7d196cbd943367ef7e2866fdd1a4b79654 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Nov 2016, 18:41 (10 years ago) parent2fa3cce
2 files changed+3−3
compare with xenial
unifiedsplit
qml/Launcher/Launcher.qml+1−1 qml/Stage/Stage.qml+2−2
qml/Launcher/Launcher.qml+1−1
@@ -133,7 +133,7 @@ FocusScope {
133133 }
134134
135135 function pushEdge(amount) {
136− if (root.state === "" || root.state == "visible") {
136+ if (root.state === "" || root.state == "visible" || root.state == "visibleTemporary") {
137137 edgeBarrier.push(amount);
138138 }
139139 }
qml/Stage/Stage.qml+2−2
@@ -471,7 +471,7 @@ FocusScope {
471471 visible: true
472472 blurRadius: 32
473473 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))
475475 }
476476 },
477477 State {
@@ -1156,7 +1156,7 @@ FocusScope {
11561156 when: root.mode == "windowed" && (root.state == "windowedRightEdge" || rightEdgeFocusAnimation.running || hidingAnimation.running || edgeBarrier.progress > 0)
11571157 PropertyChanges {
11581158 target: windowedRightEdgeMaths
1159− progress: Math.max(rightEdgeDragArea.progress, edgeBarrier.progress)
1159+ progress: Math.max(rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0, edgeBarrier.progress)
11601160 }
11611161 PropertyChanges {
11621162 target: appDelegate