git.iko.soy/unity8
on xenial help sign in
more tweaks
6cc0a40Michael Zanetti
qml/Components/EdgeBarrier.qml+2−2
compare with xenial
unifiedsplit
@@ -59,7 +59,7 @@ Item {
59
59
60 visible: positionProgress > 0
60 visible: positionProgress > 0
61
61
62− width: units.gu(1)
62+ width: units.gu(2)
63 }
63 }
64
64
65 EdgeBarrierController {
65 EdgeBarrierController {
@@ -105,7 +105,7 @@ Item {
105 },
105 },
106 Transition {
106 Transition {
107 from: "resisting"; to: "passed"
107 from: "resisting"; to: "passed"
108− UbuntuNumberAnimation { target: materialContainer; property: "opacity" }
108+ UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration; target: materialContainer; property: "opacity" }
109 }
109 }
110 ]
110 ]
111}
111}
qml/Launcher/Launcher.qml+2−2
@@ -222,8 +222,8 @@ Item {
222 rotation: -90
222 rotation: -90
223 anchors.centerIn: parent
223 anchors.centerIn: parent
224 gradient: Gradient {
224 gradient: Gradient {
225− GradientStop { position: 0.0; color: panel.color}
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.r,panel.g,panel.b,0)}
226+ GradientStop { position: 1.0; color: Qt.rgba(panel.color.r,panel.color.g,panel.color.b,0)}
227 }
227 }
228 }
228 }
229 }
229 }
qml/Stages/DesktopSpread.qml+26−13
@@ -253,16 +253,21 @@ FocusScope {
253 Transition {
253 Transition {
254 from: ""
254 from: ""
255 to: "altTab"
255 to: "altTab"
256+ SequentialAnimation {
257+ ParallelAnimation {
256− PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
258+ PropertyAction { target: spreadDelegate; properties: "y,height,width,angle,z,itemScale,itemScaleOriginY,visible" }
257− PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
259+ PropertyAction { target: clippedSpreadDelegate; properties: "anchors.topMargin" }
258− PropertyAnimation {
260+ PropertyAnimation {
259− target: spreadDelegate; properties: "x"
261+ target: spreadDelegate; properties: "x"
260− from: root.width
262+ from: root.width
261− duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
263+ duration: spreadContainer.animateIn ? UbuntuAnimation.FastDuration :0
262− easing: UbuntuAnimation.StandardEasing
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" }
263 }
270 }
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 }
266 }
271 }
267 ]
272 ]
268
273
@@ -291,12 +296,20 @@ FocusScope {
291 anchors { left: parent.left; top: parent.top; right: parent.right }
296 anchors { left: parent.left; top: parent.top; right: parent.right }
292 spacing: units.gu(1)
297 spacing: units.gu(1)
293
298
294− UbuntuShape {
299+ UbuntuShapeForItem {
295 Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
300 Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
296 Layout.preferredWidth: height * 8 / 7.6
301 Layout.preferredWidth: height * 8 / 7.6
297 image: Image {
302 image: Image {
298 anchors.fill: parent
303 anchors.fill: parent
299 source: model.icon
304 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+ }
300 }
313 }
301 }
314 }
302 Label {
315 Label {
@@ -449,7 +462,7 @@ FocusScope {
449
462
450 property var source: ShaderEffectSource {
463 property var source: ShaderEffectSource {
451 id: shaderEffectSource
464 id: shaderEffectSource
452− sourceItem: appContainer
465+ sourceItem: root.workspace
453 }
466 }
454
467
455 fragmentShader: "
468 fragmentShader: "
@@ -523,9 +536,8 @@ FocusScope {
523 from: "*"
536 from: "*"
524 to: "altTab"
537 to: "altTab"
525 SequentialAnimation {
538 SequentialAnimation {
526− PropertyAction { target: hoverMouseArea; property: "progressiveScrollingEnabled"; value: false }
527 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
539 PropertyAction { target: spreadRepeater; property: "highlightedIndex"; value: Math.min(ApplicationManager.count - 1, 1) }
528− PauseAnimation { duration: 140 }
540+ PauseAnimation { duration: spreadContainer.animateIn ? 0 : 140 }
529 PropertyAction { target: workspaceSelector; property: "visible" }
541 PropertyAction { target: workspaceSelector; property: "visible" }
530 PropertyAction { target: spreadContainer; property: "visible" }
542 PropertyAction { target: spreadContainer; property: "visible" }
531 ParallelAnimation {
543 ParallelAnimation {
@@ -534,6 +546,7 @@ FocusScope {
534 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
546 PropertyAction { targets: [currentSelectedLabel,spreadBackground]; property: "visible" }
535 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
547 PropertyAction { target: spreadFlickable; property: "contentX"; value: 0 }
536 }
548 }
549+ PropertyAction { target: hoverMouseArea; properties: "enabled,progressiveScrollingEnabled"; value: false }
537 }
550 }
538 },
551 },
539 Transition {
552 Transition {
qml/Stages/DesktopStage.qml+1−1
@@ -473,7 +473,7 @@ AbstractStage {
473 rotation: 90
473 rotation: 90
474 anchors.centerIn: parent
474 anchors.centerIn: parent
475 gradient: Gradient {
475 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)}
477 GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
477 GradientStop { position: 1.0; color: Qt.rgba(0.16,0.16,0.16,0)}
478 }
478 }
479 }
479 }
tests/qmltests/Stages/tst_DesktopStage.qml+2−1
@@ -64,8 +64,9 @@ Item {
64 property bool itemDestroyed: false
64 property bool itemDestroyed: false
65 sourceComponent: Component {
65 sourceComponent: Component {
66 DesktopStage {
66 DesktopStage {
67− color: "darkblue"
67+ color: "white"
68 anchors.fill: parent
68 anchors.fill: parent
69+ background: "../../../qml/graphics/tablet_background.jpg"
69
70
70 Component.onCompleted: {
71 Component.onCompleted: {
71 edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");
72 edgeBarrierControls.target = testCase.findChild(this, "edgeBarrierController");