on xenial help sign in
more tweaks
commit6cc0a409c2c506c74029e50a8b9e40b4e32ffb3d authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 15 Feb 2016, 17:43 (11 years ago) parent1d14bc8
5 files changed+33−19
qml/Components/EdgeBarrier.qml+2−2 qml/Launcher/Launcher.qml+2−2 qml/Stages/DesktopSpread.qml+26−13 qml/Stages/DesktopStage.qml+1−1 tests/qmltests/Stages/tst_DesktopStage.qml+2−1
qml/Components/EdgeBarrier.qml+2−2
@@ -59,7 +59,7 @@ Item {
5959
6060 visible: positionProgress > 0
6161
62− width: units.gu(1)
62+ width: units.gu(2)
6363 }
6464
6565 EdgeBarrierController {
@@ -105,7 +105,7 @@ Item {
105105 },
106106 Transition {
107107 from: "resisting"; to: "passed"
108− UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
108+ UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
109109 }
110110 ]
111111}
qml/Launcher/Launcher.qml+2−2
@@ -222,8 +222,8 @@ Item {
222222 rotation: -90
223223 anchors.centerIn: parent
224224 gradient: Gradient {
225− GradientStop { position: 0.0; color: panel.color}
226− GradientStop { position: 1.0; color: Qt.rgba(panel.r,panel.g,panel.b,0)}
225+ GradientStop { position: 0.0; color: Qt.rgba(panel.color.r, panel.color.g, panel.color.b, .5)}
226+ GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
227227 }
228228 }
229229 }
qml/Stages/DesktopSpread.qml+26−13
@@ -253,16 +253,21 @@ FocusScope {
253253 Transition {
254254 from: ""
255255 to: "altTab"
256− PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
257− PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
258− PropertyAnimation {
259− target: spreadDelegate; properties: "x"
260− from: root.width
261− duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
262− easing: UbuntuAnimation.StandardEasing
256+ SequentialAnimation {
257+ ParallelAnimation {
258+ PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
259+ PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
260+ PropertyAnimation {
261+ target: spreadDelegate; properties: "x"
262+ from: root.width
263+ duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
264+ easing: UbuntuAnimation.StandardEasing
265+ }
266+ UbuntuNumberAnimation { target: clippedSpreadDelegate; property: "shadowOpacity"; from: 0; to: spreadMaths.shadowOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
267+ UbuntuNumberAnimation { target: tileInfo; property: "opacity"; from: 0; to: spreadMaths.tileInfoOpacity; duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration : 0 }
268+ }
269+ PropertyAction { target: spreadSelectArea; property: "enabled" }
263270 }
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 }
266271 }
267272 ]
268273
@@ -291,12 +296,20 @@ FocusScope {
291296 anchors { left: parent.left; top: parent.top; right: parent.right }
292297 spacing: units.gu(1)
293298
294− UbuntuShape {
299+ UbuntuShapeForItem {
295300 Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
296301 Layout.preferredWidth: height * 8 / 7.6
297302 image: Image {
298303 anchors.fill: parent
299304 source: model.icon
305+ Rectangle {
306+ anchors.fill: parent
307+ color: "black"
308+ opacity: clippedSpreadDelegate.highlightShown ? 0 : .1
309+ Behavior on opacity {
310+ UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
311+ }
312+ }
300313 }
301314 }
302315 Label {
@@ -449,7 +462,7 @@ FocusScope {
449462
450463 property var source: ShaderEffectSource {
451464 id: shaderEffectSource
452− sourceItem: appContainer
465+ sourceItem: root.workspace
453466 }
454467
455468 fragmentShader: "
@@ -523,9 +536,8 @@ FocusScope {
523536 from: "*"
524537 to: "altTab"
525538 SequentialAnimation {
526− PropertyAction { target: hoverMouseArea; property: "progressiveScrollingEnabled"; value: false }
527539 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
528− PauseAnimation { duration: 140 }
540+ PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
529541 PropertyAction { target: workspaceSelector; property: "visible" }
530542 PropertyAction { target: spreadContainer; property: "visible" }
531543 ParallelAnimation {
@@ -534,6 +546,7 @@ FocusScope {
534546 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
535547 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
536548 }
549+ PropertyAction { target: hoverMouseArea; properties: "enabled,progressiveScrollingEnabled"; value: false }
537550 }
538551 },
539552 Transition {
qml/Stages/DesktopStage.qml+1−1
@@ -473,7 +473,7 @@ AbstractStage {
473473 rotation: 90
474474 anchors.centerIn: parent
475475 gradient: Gradient {
476− GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.7)}
476+ GradientStop { position: 0.0; color: Qt.rgba(0.16,0.16,0.16,0.5)}
477477 GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
478478 }
479479 }
tests/qmltests/Stages/tst_DesktopStage.qml+2−1
@@ -64,8 +64,9 @@ Item {
6464 property bool itemDestroyed: false
6565 sourceComponent: Component {
6666 DesktopStage {
67− color: "darkblue"
67+ color: "white"
6868 anchors.fill: parent
69+ background: "../../../qml/graphics/tablet_background.jpg"
6970
7071 Component.onCompleted: {
7172 edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");