git.iko.soy/unity8
on xenial help sign in
a little more progress
commit3e4be38bd8ee9c21eebeae442daf0adf87157e9a authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 28 Jun 2016, 11:50 (10 years ago) parent95d9b5a
4 files changed+21−16
compare with xenial
unifiedsplit
qml/Stages/ApplicationWindow.qml+5−5 qml/Stages/DesktopStage.qml+11−9 qml/Stages/SpreadMaths.qml+2 tests/qmltests/tst_Shell.qml+3−2
qml/Stages/ApplicationWindow.qml+5−5
@@ -419,9 +419,9 @@ FocusScope {
419419 ]
420420 }
421421
422− Rectangle {
423− anchors.fill: parent
424− color: "yellow"
425− opacity: .4
426− }
422+// Rectangle {
423+// anchors.fill: parent
424+// color: "yellow"
425+// opacity: .4
426+// }
427427}
qml/Stages/DesktopStage.qml+11−9
@@ -128,7 +128,7 @@ AbstractStage {
128128 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
129129
130130 property bool goneToSpread: false
131− property int animationDuration: 4000//UbuntuAnimation.SleepyDuration
131+ property int animationDuration: UbuntuAnimation.FastDuration// 4000//UbuntuAnimation.SleepyDuration
132132
133133 function updateForegroundMaximizedApp() {
134134 var found = false;
@@ -263,7 +263,7 @@ AbstractStage {
263263 id: appContainer
264264 objectName: "appContainer"
265265 anchors.fill: parent
266− focus: spread.state !== "altTab"
266+ focus: root.state !== "altTab"
267267
268268 CrossFadeImage {
269269 id: wallpaper
@@ -542,7 +542,7 @@ AbstractStage {
542542 targetAngle: spreadMaths.animatedAngle
543543 }
544544
545− onXChanged: if (model.application.appId == "unity8-dash") print("dash moved to", x)
545+// onXChanged: if (model.application.appId == "unity8-dash") print("dash moved to", x)
546546// onRequestedWidthChanged: if (index == 0) print("requestedWidth", requestedWidth)
547547 onStateChanged: if (model.application.appId == "unity8-dash") print("state changed", state)
548548 states: [
@@ -566,6 +566,7 @@ AbstractStage {
566566 }
567567 PropertyChanges { target: inputBlocker; enabled: true }
568568 PropertyChanges { target: windowInfoItem; opacity: 1 }
569+ PropertyChanges { target: floatingFlickable; enabled: true }
569570 },
570571 State {
571572 name: "stagedrightedge";
@@ -837,6 +838,7 @@ AbstractStage {
837838 onDecorationPressed: { appDelegate.focus = true; }
838839
839840 property real angle: 0
841+ property real itemScale: 1
840842 transform: [
841843// Scale {
842844// origin.x: itemScaleOriginX
@@ -845,7 +847,7 @@ AbstractStage {
845847// yScale: itemScale
846848// },
847849 Rotation {
848− // origin { x: 0; y: (clippedSpreadDelegate.height - (clippedSpreadDelegate.height * itemScale / 2)) }
850+ origin { x: 0; y: (decoratedWindow.height - (decoratedWindow.height * decoratedWindow.itemScale / 2)) }
849851 axis { x: 0; y: 1; z: 0 }
850852 angle: decoratedWindow.angle
851853 }
@@ -875,11 +877,11 @@ AbstractStage {
875877 priv.goneToSpread = false;
876878 }
877879 }
878− Rectangle {
879− anchors.fill: parent
880− color: "blue"
881− opacity: .4
882− }
880+// Rectangle {
881+// anchors.fill: parent
882+// color: "blue"
883+// opacity: .4
884+// }
883885
884886 WindowInfoItem {
885887 id: windowInfoItem
qml/Stages/SpreadMaths.qml+2
@@ -68,6 +68,7 @@ Item {
6868
6969 // Output
7070 readonly property int animatedX: {
71+ if (itemIndex == 0) print("leftFoldingAreaProgress", leftFoldingAreaProgress, "rightFoldingAreaProgress", rightFoldingAreaProgress)
7172 if (leftFoldingAreaProgress > 4) { // Stop it at the edge
7273 return margins;
7374 }
@@ -94,6 +95,7 @@ Item {
9495 }
9596
9697 if (rightFoldingAreaProgress > 0) {
98+ print("returning this")
9799 return linearAnimation(0, 1, rightFoldingAreaX, flickableWidth - margins - stackWidth, rightEasing.value);
98100 }
99101
tests/qmltests/tst_Shell.qml+3−2
@@ -208,14 +208,15 @@ Rectangle {
208208 }
209209 }
210210 ListItem.ItemSelector {
211+ id: sizeSelector
211212 anchors { left: parent.left; right: parent.right }
212213 activeFocusOnPress: false
213214 text: "Size"
214215 model: ["phone", "tablet", "desktop"]
215216 onSelectedIndexChanged: {
216− shellLoader.active = false;
217+// shellLoader.active = false;
217218 shellLoader.state = model[selectedIndex];
218− shellLoader.active = true;
219+// shellLoader.active = true;
219220 }
220221 }
221222 ListItem.ItemSelector {