git.iko.soy/unity8
on xenial help sign in
fade the appItem properly, fix claimFocus
8101754Michael Zanetti
po/unity8.pot+1−1
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"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"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
qml/Stages/DesktopStage.qml+2−5
@@ -511,10 +511,7 @@ AbstractStage {
511 readonly property alias resizeArea: resizeArea
511 readonly property alias resizeArea: resizeArea
512
512
513 function claimFocus() {
513 function claimFocus() {
514−// if (spread.state == "altTab") {
515−// spread.cancel();
516−// }
517−// appDelegate.restore();
514+ appDelegate.focus = true;
518 }
515 }
519 Connections {
516 Connections {
520 target: model.surface
517 target: model.surface
@@ -772,6 +769,7 @@ AbstractStage {
772 height: stagedRightEdgeMaths.animatedHeight
769 height: stagedRightEdgeMaths.animatedHeight
773 requestedWidth: decoratedWindow.oldRequestedWidth
770 requestedWidth: decoratedWindow.oldRequestedWidth
774 requestedHeight: decoratedWindow.oldRequestedHeight
771 requestedHeight: decoratedWindow.oldRequestedHeight
772+ visible: stagedRightEdgeMaths.itemVisible
775 }
773 }
776 PropertyChanges {
774 PropertyChanges {
777 target: decoratedWindow;
775 target: decoratedWindow;
@@ -1124,7 +1122,6 @@ AbstractStage {
1124 height: spreadItem.appInfoHeight
1122 height: spreadItem.appInfoHeight
1125 opacity: 0
1123 opacity: 0
1126 visible: opacity > 0
1124 visible: opacity > 0
1127− Behavior on opacity { UbuntuNumberAnimation { duration: priv.animationDuration } }
1128 }
1125 }
1129 }
1126 }
1130 }
1127 }
qml/Stages/Spread/StagedRightEdgeMaths.qml+3−1
@@ -54,7 +54,7 @@ QtObject {
54 if (progress < breakPoint) {
54 if (progress < breakPoint) {
55 return startX
55 return startX
56 }
56 }
57− return MathUtils.linearAnimation(breakPoint, 1, startX, targetX, progress)
57+ return MathUtils.linearAnimation(breakPoint, 1, startX + (itemIndex - 1) * tileDistance, targetX, progress)
58 }
58 }
59
59
60 readonly property int animatedY: progress < breakPoint ? startY : MathUtils.linearAnimation(breakPoint, 1, startY, targetY, progress)
60 readonly property int animatedY: progress < breakPoint ? startY : MathUtils.linearAnimation(breakPoint, 1, startY, targetY, progress)
@@ -64,4 +64,6 @@ QtObject {
64
64
65 readonly property real animatedScale: itemIndex == 0 ? MathUtils.linearAnimation(0, 1, 1, targetScale, progress)
65 readonly property real animatedScale: itemIndex == 0 ? MathUtils.linearAnimation(0, 1, 1, targetScale, progress)
66 : MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
66 : MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
67+
68+ readonly property bool itemVisible: true //animatedX < sceneWidth
67}
69}