git.iko.soy/unity8
on xenial help sign in
more tweaks as per design review
1d14bc8Michael Zanetti
qml/Stages/DesktopSpread.qml+30−5
compare with xenial
unifiedsplit
@@ -19,6 +19,7 @@ import QtQuick.Layouts 1.1
19import Ubuntu.Components 1.3
19import Ubuntu.Components 1.3
20import Ubuntu.Gestures 0.1
20import Ubuntu.Gestures 0.1
21import Unity.Application 0.1
21import Unity.Application 0.1
22+import "../Components"
22
23
23FocusScope {
24FocusScope {
24 id: root
25 id: root
@@ -26,6 +27,7 @@ FocusScope {
26 property bool altTabPressed: false
27 property bool altTabPressed: false
27 property Item workspace: null
28 property Item workspace: null
28
29
30+ readonly property alias ready: blurLayer.ready
29 readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
31 readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
30
32
31 function show() {
33 function show() {
@@ -101,6 +103,31 @@ FocusScope {
101 state = ""
103 state = ""
102 }
104 }
103
105
106+ BlurLayer {
107+ id: blurLayer
108+ anchors.fill: parent
109+ source: root.workspace
110+ visible: false
111+ }
112+
113+ Rectangle {
114+ id: spreadBackground
115+ anchors.fill: parent
116+ color: "#B2000000"
117+ visible: false
118+ opacity: visible ? 1 : 0
119+ Behavior on opacity {
120+ UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
121+ }
122+ }
123+
124+ MouseArea {
125+ id: eventEater
126+ anchors.fill: parent
127+ visible: spreadBackground.visible
128+ enabled: visible
129+ }
130+
104 Item {
131 Item {
105 id: spreadContainer
132 id: spreadContainer
106 objectName: "spreadContainer"
133 objectName: "spreadContainer"
@@ -234,6 +261,8 @@ FocusScope {
234 duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
261 duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
235 easing: UbuntuAnimation.StandardEasing
262 easing: UbuntuAnimation.StandardEasing
236 }
263 }
264+ UbuntuNumberAnimation { target: clippedSpreadDelegate; property: "shadowOpacity"; from: 0; to: spreadMaths.shadowOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
265+ UbuntuNumberAnimation { target: tileInfo; property: "opacity"; from: 0; to: spreadMaths.tileInfoOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
237 }
266 }
238 ]
267 ]
239
268
@@ -500,10 +529,7 @@ FocusScope {
500 PropertyAction { target: workspaceSelector; property: "visible" }
529 PropertyAction { target: workspaceSelector; property: "visible" }
501 PropertyAction { target: spreadContainer; property: "visible" }
530 PropertyAction { target: spreadContainer; property: "visible" }
502 ParallelAnimation {
531 ParallelAnimation {
503− UbuntuNumberAnimation {
504− target: blurLayer; properties: "saturation,blurRadius";
532+ UbuntuNumberAnimation { target: blurLayer; properties: "saturation,blurRadius"; duration: UbuntuAnimation.SnapDuration }
505− duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0
506− }
507 PropertyAction { target: spreadFlickable; property: "visible" }
533 PropertyAction { target: spreadFlickable; property: "visible" }
508 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
534 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
509 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
535 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
@@ -518,6 +544,5 @@ FocusScope {
518 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
544 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
519 PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
545 PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
520 }
546 }
521−
522 ]
547 ]
523}
548}
qml/Stages/DesktopStage.qml+1−22
@@ -423,7 +423,7 @@ AbstractStage {
423 target: appDelegate
423 target: appDelegate
424 property: "z"
424 property: "z"
425 value: ApplicationManager.count + 1
425 value: ApplicationManager.count + 1
426− when: index == spread.highlightedIndex && blurLayer.ready
426+ when: index == spread.highlightedIndex && spread.ready
427 }
427 }
428
428
429 WindowResizeArea {
429 WindowResizeArea {
@@ -458,27 +458,6 @@ AbstractStage {
458 }
458 }
459 }
459 }
460
460
461− BlurLayer {
462− id: blurLayer
463− anchors.fill: parent
464− source: appContainer
465− visible: false
466− }
467−
468− Rectangle {
469− id: spreadBackground
470− anchors.fill: parent
471− color: "#B3000000"
472− visible: false
473− }
474−
475− MouseArea {
476− id: eventEater
477− anchors.fill: parent
478− visible: spreadBackground.visible
479− enabled: visible
480− }
481−
482 EdgeBarrier {
461 EdgeBarrier {
483 id: edgeBarrier
462 id: edgeBarrier
484
463