git.iko.soy/unity8
on xenial help sign in
a little more progress
3e4be38Michael Zanetti
qml/Stages/ApplicationWindow.qml+5−5
compare with xenial
unifiedsplit
@@ -419,9 +419,9 @@ FocusScope {
419 ]
419 ]
420 }
420 }
421
421
422− Rectangle {
422+// Rectangle {
423− anchors.fill: parent
423+// anchors.fill: parent
424− color: "yellow"
424+// color: "yellow"
425− opacity: .4
425+// opacity: .4
426− }
426+// }
427}
427}
qml/Stages/DesktopStage.qml+11−9
@@ -128,7 +128,7 @@ AbstractStage {
128 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
128 property var foregroundMaximizedAppDelegate: null // for stuff like drop shadow and focusing maximized app by clicking panel
129
129
130 property bool goneToSpread: false
130 property bool goneToSpread: false
131− property int animationDuration: 4000//UbuntuAnimation.SleepyDuration
131+ property int animationDuration: UbuntuAnimation.FastDuration// 4000//UbuntuAnimation.SleepyDuration
132
132
133 function updateForegroundMaximizedApp() {
133 function updateForegroundMaximizedApp() {
134 var found = false;
134 var found = false;
@@ -263,7 +263,7 @@ AbstractStage {
263 id: appContainer
263 id: appContainer
264 objectName: "appContainer"
264 objectName: "appContainer"
265 anchors.fill: parent
265 anchors.fill: parent
266− focus: spread.state !== "altTab"
266+ focus: root.state !== "altTab"
267
267
268 CrossFadeImage {
268 CrossFadeImage {
269 id: wallpaper
269 id: wallpaper
@@ -542,7 +542,7 @@ AbstractStage {
542 targetAngle: spreadMaths.animatedAngle
542 targetAngle: spreadMaths.animatedAngle
543 }
543 }
544
544
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)
546// onRequestedWidthChanged: if (index == 0) print("requestedWidth", requestedWidth)
546// onRequestedWidthChanged: if (index == 0) print("requestedWidth", requestedWidth)
547 onStateChanged: if (model.application.appId == "unity8-dash") print("state changed", state)
547 onStateChanged: if (model.application.appId == "unity8-dash") print("state changed", state)
548 states: [
548 states: [
@@ -566,6 +566,7 @@ AbstractStage {
566 }
566 }
567 PropertyChanges { target: inputBlocker; enabled: true }
567 PropertyChanges { target: inputBlocker; enabled: true }
568 PropertyChanges { target: windowInfoItem; opacity: 1 }
568 PropertyChanges { target: windowInfoItem; opacity: 1 }
569+ PropertyChanges { target: floatingFlickable; enabled: true }
569 },
570 },
570 State {
571 State {
571 name: "stagedrightedge";
572 name: "stagedrightedge";
@@ -837,6 +838,7 @@ AbstractStage {
837 onDecorationPressed: { appDelegate.focus = true; }
838 onDecorationPressed: { appDelegate.focus = true; }
838
839
839 property real angle: 0
840 property real angle: 0
841+ property real itemScale: 1
840 transform: [
842 transform: [
841// Scale {
843// Scale {
842// origin.x: itemScaleOriginX
844// origin.x: itemScaleOriginX
@@ -845,7 +847,7 @@ AbstractStage {
845// yScale: itemScale
847// yScale: itemScale
846// },
848// },
847 Rotation {
849 Rotation {
848− // origin { x: 0; y: (clippedSpreadDelegate.height - (clippedSpreadDelegate.height * itemScale / 2)) }
850+ origin { x: 0; y: (decoratedWindow.height - (decoratedWindow.height * decoratedWindow.itemScale / 2)) }
849 axis { x: 0; y: 1; z: 0 }
851 axis { x: 0; y: 1; z: 0 }
850 angle: decoratedWindow.angle
852 angle: decoratedWindow.angle
851 }
853 }
@@ -875,11 +877,11 @@ AbstractStage {
875 priv.goneToSpread = false;
877 priv.goneToSpread = false;
876 }
878 }
877 }
879 }
878− Rectangle {
880+// Rectangle {
879− anchors.fill: parent
881+// anchors.fill: parent
880− color: "blue"
882+// color: "blue"
881− opacity: .4
883+// opacity: .4
882− }
884+// }
883
885
884 WindowInfoItem {
886 WindowInfoItem {
885 id: windowInfoItem
887 id: windowInfoItem
qml/Stages/SpreadMaths.qml+2
@@ -68,6 +68,7 @@ Item {
68
68
69 // Output
69 // Output
70 readonly property int animatedX: {
70 readonly property int animatedX: {
71+ if (itemIndex == 0) print("leftFoldingAreaProgress", leftFoldingAreaProgress, "rightFoldingAreaProgress", rightFoldingAreaProgress)
71 if (leftFoldingAreaProgress > 4) { // Stop it at the edge
72 if (leftFoldingAreaProgress > 4) { // Stop it at the edge
72 return margins;
73 return margins;
73 }
74 }
@@ -94,6 +95,7 @@ Item {
94 }
95 }
95
96
96 if (rightFoldingAreaProgress > 0) {
97 if (rightFoldingAreaProgress > 0) {
98+ print("returning this")
97 return linearAnimation(0, 1, rightFoldingAreaX, flickableWidth - margins - stackWidth, rightEasing.value);
99 return linearAnimation(0, 1, rightFoldingAreaX, flickableWidth - margins - stackWidth, rightEasing.value);
98 }
100 }
99
101
tests/qmltests/tst_Shell.qml+3−2
@@ -208,14 +208,15 @@ Rectangle {
208 }
208 }
209 }
209 }
210 ListItem.ItemSelector {
210 ListItem.ItemSelector {
211+ id: sizeSelector
211 anchors { left: parent.left; right: parent.right }
212 anchors { left: parent.left; right: parent.right }
212 activeFocusOnPress: false
213 activeFocusOnPress: false
213 text: "Size"
214 text: "Size"
214 model: ["phone", "tablet", "desktop"]
215 model: ["phone", "tablet", "desktop"]
215 onSelectedIndexChanged: {
216 onSelectedIndexChanged: {
216− shellLoader.active = false;
217+// shellLoader.active = false;
217 shellLoader.state = model[selectedIndex];
218 shellLoader.state = model[selectedIndex];
218− shellLoader.active = true;
219+// shellLoader.active = true;
219 }
220 }
220 }
221 }
221 ListItem.ItemSelector {
222 ListItem.ItemSelector {