1
=== modified file 'qml/Components/BlurLayer.qml'
2
--- qml/Components/BlurLayer.qml	2015-09-18 11:39:22 +0000
3
+++ qml/Components/BlurLayer.qml	2016-11-09 13:03:30 +0000
4
@@ -20,50 +20,20 @@
5
20
Item {
20
Item {
6
21
    id: root
21
    id: root
7
22
22
46
23
    property alias source: shaderEffectSource.sourceItem
23
    property alias source: fastBlur.source
47
24
    property alias saturation: desaturateEffect.saturationValue
24
    property real brightness: 1
48
25
    property alias blurRadius: fastBlur.radius
25
    property real blurRadius: 0
11
26
12
27
    readonly property alias ready: shaderEffectSource.ready
13
28
14
29
    ShaderEffect {
15
30
        id: desaturateEffect
16
31
        anchors.fill: root
17
32
18
33
        property real saturationValue: 1
19
34
20
35
        property variant source: ShaderEffectSource {
21
36
            id: shaderEffectSource
22
37
            hideSource: root.visible
23
38
            live: !root.visible
24
39
            property bool ready: false;
25
40
            onLiveChanged: {
26
41
                if (!live) {
27
42
                    ready = false;
28
43
                    scheduleUpdate();
29
44
                }
30
45
            }
31
46
            onScheduledUpdateCompleted: ready = true;
32
47
        }
33
48
34
49
        fragmentShader: "
35
50
            varying highp vec2 qt_TexCoord0;
36
51
            uniform sampler2D source;
37
52
            uniform lowp float saturationValue;
38
53
            void main(void)
39
54
            {
40
55
                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
41
56
                highp vec4 scaledColor = sourceColor * vec4(0.3, 0.59, 0.11, 1.0);
42
57
                lowp float luminance = scaledColor.r + scaledColor.g + scaledColor.b ;
43
58
                gl_FragColor = mix(vec4(luminance, luminance, luminance, sourceColor.a), sourceColor, saturationValue);
44
59
            }"
45
60
    }
49
61
26
50
62
    FastBlur {
27
    FastBlur {
51
63
        id: fastBlur
28
        id: fastBlur
52
64
        anchors.fill: parent
29
        anchors.fill: parent
53
65
        source: desaturateEffect
54
66
        visible: radius > 0
30
        visible: radius > 0
56
67
        radius: 0
31
        radius: Math.max(root.blurRadius, 0)
57
32
    }
58
33
59
34
    Rectangle {
60
35
        anchors.fill: parent
61
36
        color: "black"
62
37
        opacity: 1 - root.brightness
63
68
    }
38
    }
64
69
}
39
}
65
70
40
66
=== modified file 'qml/Stage/Stage.qml'
67
--- qml/Stage/Stage.qml	2016-10-24 11:34:20 +0000
68
+++ qml/Stage/Stage.qml	2016-11-09 13:03:30 +0000
69
@@ -54,7 +54,7 @@
70
54
54
71
55
    // Used by the tutorial code
55
    // Used by the tutorial code
72
56
    readonly property bool spreadShown: state == "spread"
56
    readonly property bool spreadShown: state == "spread"
74
57
    readonly property real rightEdgeDragProgress: rightEdgeDragArea.progress // How far left the stage has been dragged
57
    readonly property real rightEdgeDragProgress: rightEdgeDragArea.dragging ? rightEdgeDragArea.progress : 0 // How far left the stage has been dragged
75
58
58
76
59
    // used by the snap windows (edge maximize) feature
59
    // used by the snap windows (edge maximize) feature
77
60
    readonly property alias previewRectangle: fakeRectangle
60
    readonly property alias previewRectangle: fakeRectangle
78
@@ -409,12 +409,22 @@
79
409
            PropertyChanges { target: hoverMouseArea; enabled: true }
409
            PropertyChanges { target: hoverMouseArea; enabled: true }
80
410
            PropertyChanges { target: rightEdgeDragArea; enabled: false }
410
            PropertyChanges { target: rightEdgeDragArea; enabled: false }
81
411
            PropertyChanges { target: cancelSpreadMouseArea; enabled: true }
411
            PropertyChanges { target: cancelSpreadMouseArea; enabled: true }
82
412
            PropertyChanges { target: blurLayer; visible: true; blurRadius: 32; brightness: .65; opacity: 1 }
83
413
            PropertyChanges { target: wallpaper; visible: false }
84
412
        },
414
        },
85
413
        State {
415
        State {
86
414
            name: "stagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "staged"
416
            name: "stagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "staged"
87
417
            PropertyChanges {
88
418
                target: blurLayer;
89
419
                visible: true;
90
420
                blurRadius: 32
91
421
                brightness: .65
92
422
                opacity: 1
93
423
            }
94
415
        },
424
        },
95
416
        State {
425
        State {
96
417
            name: "sideStagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "stagedWithSideStage"
426
            name: "sideStagedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "stagedWithSideStage"
97
427
            extend: "stagedRightEdge"
98
418
            PropertyChanges {
428
            PropertyChanges {
99
419
                target: sideStage
429
                target: sideStage
100
420
                opacity: priv.sideStageDelegate.x === sideStage.x ? 1 : 0
430
                opacity: priv.sideStageDelegate.x === sideStage.x ? 1 : 0
101
@@ -423,9 +433,17 @@
102
423
        },
433
        },
103
424
        State {
434
        State {
104
425
            name: "windowedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "windowed"
435
            name: "windowedRightEdge"; when: (rightEdgeDragArea.dragging || edgeBarrier.progress > 0) && root.mode == "windowed"
105
436
            PropertyChanges {
106
437
                target: blurLayer;
107
438
                visible: true
108
439
                blurRadius: 32
109
440
                brightness: .65
110
441
                opacity: MathUtils.linearAnimation(spreadItem.rightEdgeBreakPoint, 1, 0, 1, Math.max(rightEdgeDragArea.progress, edgeBarrier.progress))
111
442
            }
112
426
        },
443
        },
113
427
        State {
444
        State {
114
428
            name: "staged"; when: root.mode === "staged"
445
            name: "staged"; when: root.mode === "staged"
115
446
            PropertyChanges { target: wallpaper; visible: false }
116
429
        },
447
        },
117
430
        State {
448
        State {
118
431
            name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
449
            name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
119
@@ -440,6 +458,7 @@
120
440
        Transition {
458
        Transition {
121
441
            from: "stagedRightEdge,sideStagedRightEdge,windowedRightEdge"; to: "spread"
459
            from: "stagedRightEdge,sideStagedRightEdge,windowedRightEdge"; to: "spread"
122
442
            PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
460
            PropertyAction { target: spreadItem; property: "highlightedIndex"; value: -1 }
123
461
            PropertyAnimation { target: blurLayer; properties: "brightness,blurRadius"; duration: priv.animationDuration }
124
443
        },
462
        },
125
444
        Transition {
463
        Transition {
126
445
            to: "spread"
464
            to: "spread"
127
@@ -494,6 +513,13 @@
128
494
            z: -2
513
            z: -2
129
495
        }
514
        }
130
496
515
131
516
        BlurLayer {
132
517
            id: blurLayer
133
518
            anchors.fill: parent
134
519
            source: wallpaper
135
520
            visible: false
136
521
        }
137
522
138
497
        Spread {
523
        Spread {
139
498
            id: spreadItem
524
            id: spreadItem
140
499
            objectName: "spreadItem"
525
            objectName: "spreadItem"
141
@@ -1730,7 +1756,7 @@
142
1730
        property var gesturePoints: []
1756
        property var gesturePoints: []
143
1731
        property bool cancelled: false
1757
        property bool cancelled: false
144
1732
1758
146
1733
        property real progress: dragging ? -touchPosition.x / root.width : 0
1759
        property real progress: -touchPosition.x / root.width
147
1734
        onProgressChanged: {
1760
        onProgressChanged: {
148
1735
            if (dragging) {
1761
            if (dragging) {
149
1736
                draggedProgress = progress;
1762
                draggedProgress = progress;
Status:	Merged
Approved by:	Lukáš Tinkl on 2016-10-31
Approved revision:	2672
Merged at revision:	2686
Proposed branch:	lp:~mzanetti/unity8/spread-blur
Merge into:	lp:unity8
Prerequisite:	lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2022
Diff against target:	149 lines (+38/-42) 2 files modified qml/Components/BlurLayer.qml (+10/-40) qml/Stage/Stage.qml (+28/-2)
To merge this branch:	bzr merge lp:~mzanetti/unity8/spread-blur
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-10-26	Approve on 2016-10-31
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-10-26
Review via email: mp+309335@code.launchpad.net