git.iko.soy/unity8
on xenial help sign in
fade the appItem properly, fix claimFocus
commit8101754ab76cf6cfc0ffb51e45946ac3aeae9645 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 19 Jul 2016, 15:04 (10 years ago) parent17ebf89
3 files changed+6−7
compare with xenial
unifiedsplit
po/unity8.pot+1−1 qml/Stages/DesktopStage.qml+2−5 qml/Stages/Spread/StagedRightEdgeMaths.qml+3−1
po/unity8.pot+1−1
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2016-07-16 01:28+0200\n"
11+"POT-Creation-Date: 2016-07-19 14:58+0200\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
qml/Stages/DesktopStage.qml+2−5
@@ -511,10 +511,7 @@ AbstractStage {
511511 readonly property alias resizeArea: resizeArea
512512
513513 function claimFocus() {
514−// if (spread.state == "altTab") {
515−// spread.cancel();
516−// }
517−// appDelegate.restore();
514+ appDelegate.focus = true;
518515 }
519516 Connections {
520517 target: model.surface
@@ -772,6 +769,7 @@ AbstractStage {
772769 height: stagedRightEdgeMaths.animatedHeight
773770 requestedWidth: decoratedWindow.oldRequestedWidth
774771 requestedHeight: decoratedWindow.oldRequestedHeight
772+ visible: stagedRightEdgeMaths.itemVisible
775773 }
776774 PropertyChanges {
777775 target: decoratedWindow;
@@ -1124,7 +1122,6 @@ AbstractStage {
11241122 height: spreadItem.appInfoHeight
11251123 opacity: 0
11261124 visible: opacity > 0
1127− Behavior on opacity { UbuntuNumberAnimation { duration: priv.animationDuration } }
11281125 }
11291126 }
11301127 }
qml/Stages/Spread/StagedRightEdgeMaths.qml+3−1
@@ -54,7 +54,7 @@ QtObject {
5454 if (progress < breakPoint) {
5555 return startX
5656 }
57− return MathUtils.linearAnimation(breakPoint, 1, startX, targetX, progress)
57+ return MathUtils.linearAnimation(breakPoint, 1, startX + (itemIndex - 1) * tileDistance, targetX, progress)
5858 }
5959
6060 readonly property int animatedY: progress < breakPoint ? startY : MathUtils.linearAnimation(breakPoint, 1, startY, targetY, progress)
@@ -64,4 +64,6 @@ QtObject {
6464
6565 readonly property real animatedScale: itemIndex == 0 ? MathUtils.linearAnimation(0, 1, 1, targetScale, progress)
6666 : MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
67+
68+ readonly property bool itemVisible: true //animatedX < sceneWidth
6769}