Ubuntu Pastebin

Paste from dandrader at Thu, 15 Oct 2015 13:59:15 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
=== modified file 'qml/Notifications/Notification.qml'
--- qml/Notifications/Notification.qml	2015-09-24 12:51:59 +0000
+++ qml/Notifications/Notification.qml	2015-10-15 12:55:53 +0000
@@ -50,6 +50,7 @@
     readonly property real contentSpacing: units.gu(2)
     readonly property bool canBeClosed: type === Notification.Ephemeral
     property bool hasMouse
+    property url background: ""
 
     objectName: "background"
     implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : outterColumn.height - shapedBack.anchors.topMargin + contentSpacing * 2) : 0
@@ -401,6 +402,7 @@
                         menuData: model
                         menuIndex: index
                         maxHeight: notification.maxHeight
+                        background: notification.background
 
                         onLoaded: {
                             notification.fullscreen = Qt.binding(function() { return fullscreen; });

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-11-17 13:46:56 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-10-15 12:56:22 +0000
@@ -30,6 +30,7 @@
     property int menuIndex : -1
     property int maxHeight
     readonly property bool fullscreen: menuData.type === "com.canonical.snapdecision.pinlock"
+    property url background: ""
 
     signal accepted()
 
@@ -149,7 +150,7 @@
             infoText: notification.summary
             errorText: errorAction.valid ? errorAction.state : ""
             retryText: notification.body
-            background: shell.background
+            background: menuFactory.background
             darkenBackground: 0.4
 
             onEntered: {

=== modified file 'qml/Notifications/Notifications.qml'
--- qml/Notifications/Notifications.qml	2015-09-22 14:23:44 +0000
+++ qml/Notifications/Notifications.qml	2015-10-15 12:52:40 +0000
@@ -29,6 +29,7 @@
     property real margin
     property bool useModal: snapDecisionProxyModel.count > 0
     property bool hasMouse
+    property url background: ""
 
     UnitySortFilterProxyModel {
         id: snapDecisionProxyModel
@@ -60,6 +61,7 @@
         maxHeight: notificationList.height
         margins: notificationList.margin
         hasMouse: notificationList.hasMouse
+        background: notificationList.background
 
         // make sure there's no opacity-difference between the several
         // elements in a notification

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2015-10-05 16:04:47 +0000
+++ qml/Shell.qml	2015-10-15 12:53:09 +0000
@@ -610,6 +610,7 @@
             model: NotificationBackend.Model
             margin: units.gu(1)
             hasMouse: shell.hasMouse
+            background: wallpaperResolver.background
 
             y: topmostIsFullscreen ? 0 : panel.panelHeight
             height: parent.height - (topmostIsFullscreen ? 0 : panel.panelHeight)
Download as text