on xenial help sign in
more tweaks as per design review
commit1d14bc8ee89d87337ea7b977d03c1cedb0061a4a authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 11 Jan 2016, 18:21 (11 years ago) parent245f1be
2 files changed+31−27
qml/Stages/DesktopSpread.qml+30−5 qml/Stages/DesktopStage.qml+1−22
qml/Stages/DesktopSpread.qml+30−5
@@ -19,6 +19,7 @@ import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.3
2020import Ubuntu.Gestures 0.1
2121import Unity.Application 0.1
22+import "../Components"
2223
2324FocusScope {
2425 id: root
@@ -26,6 +27,7 @@ FocusScope {
2627 property bool altTabPressed: false
2728 property Item workspace: null
2829
30+ readonly property alias ready: blurLayer.ready
2931 readonly property alias highlightedIndex: spreadRepeater.highlightedIndex
3032
3133 function show() {
@@ -101,6 +103,31 @@ FocusScope {
101103 state = ""
102104 }
103105
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+
104131 Item {
105132 id: spreadContainer
106133 objectName: "spreadContainer"
@@ -234,6 +261,8 @@ FocusScope {
234261 duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
235262 easing: UbuntuAnimation.StandardEasing
236263 }
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 }
237266 }
238267 ]
239268
@@ -500,10 +529,7 @@ FocusScope {
500529 PropertyAction { target: workspaceSelector; property: "visible" }
501530 PropertyAction { target: spreadContainer; property: "visible" }
502531 ParallelAnimation {
503− UbuntuNumberAnimation {
504− target: blurLayer; properties: "saturation,blurRadius";
505− duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0
506− }
532+ UbuntuNumberAnimation { target: blurLayer; properties: "saturation,blurRadius"; duration: UbuntuAnimation.SnapDuration }
507533 PropertyAction { target: spreadFlickable; property: "visible" }
508534 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
509535 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
@@ -518,6 +544,5 @@ FocusScope {
518544 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: -1 }
519545 PropertyAction { target: spreadContainer; property: "animateIn"; value: false }
520546 }
521−
522547 ]
523548}
qml/Stages/DesktopStage.qml+1−22
@@ -423,7 +423,7 @@ AbstractStage {
423423 target: appDelegate
424424 property: "z"
425425 value: ApplicationManager.count + 1
426− when: index == spread.highlightedIndex && blurLayer.ready
426+ when: index == spread.highlightedIndex && spread.ready
427427 }
428428
429429 WindowResizeArea {
@@ -458,27 +458,6 @@ AbstractStage {
458458 }
459459 }
460460
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−
482461 EdgeBarrier {
483462 id: edgeBarrier
484463