git.iko.soy/unity8
on xenial help sign in
Make contracted snap-decision notifications swipe-to-dismiss-able to comply with latest design-requirements... AP-tests wip still.
cbbdd0cMirco Müller
qml/Notifications/Notification.qml+37−1
compare with xenial
unifiedsplit
@@ -37,6 +37,7 @@ Item {
37 property var notification
37 property var notification
38 property color color
38 property color color
39 property bool fullscreen: false
39 property bool fullscreen: false
40+ property bool draggable: notification.type == Notification.SnapDecision && state == "contracted"
40 property int maxHeight
41 property int maxHeight
41 property int margins
42 property int margins
42 property Gradient greenGradient : Gradient {
43 property Gradient greenGradient : Gradient {
@@ -52,7 +53,7 @@ Item {
52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
53 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
53
54
54 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55 color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55− opacity: 1 // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
56+ opacity: 1 - (x / notification.width) // FIXME: 1 because of LP: #1354406 workaround, has to be 0 really
56
57
57 state: {
58 state: {
58 var result = "";
59 var result = "";
@@ -89,6 +90,16 @@ Item {
89 }
90 }
90 }
91 }
91
92
93+ Behavior on x {
94+ id: normalXBehavior
95+
96+ enabled: draggable
97+ UbuntuNumberAnimation {
98+ duration: UbuntuAnimation.FastDuration
99+ easing.type: Easing.OutBounce
100+ }
101+ }
102+
92 Behavior on height {
103 Behavior on height {
93 id: normalHeightBehavior
104 id: normalHeightBehavior
94
105
@@ -142,6 +153,12 @@ Item {
142 opacity: parent.opacity
153 opacity: parent.opacity
143 }
154 }
144
155
156+ onXChanged: {
157+ if (draggable && notification.x > 0.75 * notification.width) {
158+ notification.notification.close()
159+ }
160+ }
161+
145 Item {
162 Item {
146 id: contents
163 id: contents
147 anchors.fill: fullscreen ? nonShapedBack : shapedBack
164 anchors.fill: fullscreen ? nonShapedBack : shapedBack
@@ -189,6 +206,12 @@ Item {
189
206
190 anchors.fill: parent
207 anchors.fill: parent
191 objectName: "interactiveArea"
208 objectName: "interactiveArea"
209+
210+ drag.target: draggable ? notification : undefined
211+ drag.axis: Drag.XAxis
212+ drag.minimumX: 0
213+ drag.maximumX: notification.width
214+
192 onClicked: {
215 onClicked: {
193 if (notification.type == Notification.Interactive) {
216 if (notification.type == Notification.Interactive) {
194 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
217 notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
@@ -196,6 +219,19 @@ Item {
196 notificationList.currentIndex = index;
219 notificationList.currentIndex = index;
197 }
220 }
198 }
221 }
222+ onPressed: {
223+ if (draggable) {
224+ notification.anchors.left = undefined
225+ notification.anchors.right = undefined
226+ }
227+ }
228+ onReleased: {
229+ if (notification.x < notification.width / 2) {
230+ notification.x = 0
231+ } else {
232+ notification.x = notification.width
233+ }
234+ }
199 }
235 }
200
236
201 Column {
237 Column {