Index: resources/images/bell-off.svg =================================================================== diff -u -r733dbd53c542d94baa4862b6d657aa555209ee00 -reea7f072f684a611d54f86b14c9d68e316bba0c6 --- resources/images/bell-off.svg (.../bell-off.svg) (revision 733dbd53c542d94baa4862b6d657aa555209ee00) +++ resources/images/bell-off.svg (.../bell-off.svg) (revision eea7f072f684a611d54f86b14c9d68e316bba0c6) @@ -1 +1 @@ - \ No newline at end of file + Index: resources/images/bell.svg =================================================================== diff -u -r733dbd53c542d94baa4862b6d657aa555209ee00 -reea7f072f684a611d54f86b14c9d68e316bba0c6 --- resources/images/bell.svg (.../bell.svg) (revision 733dbd53c542d94baa4862b6d657aa555209ee00) +++ resources/images/bell.svg (.../bell.svg) (revision eea7f072f684a611d54f86b14c9d68e316bba0c6) @@ -1 +1 @@ - \ No newline at end of file + Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r7ec3c17557cc787170546ba490dcd63ddefe0f67 -reea7f072f684a611d54f86b14c9d68e316bba0c6 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 7ec3c17557cc787170546ba490dcd63ddefe0f67) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision eea7f072f684a611d54f86b14c9d68e316bba0c6) @@ -14,7 +14,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 // Project import Gui.Actions 0.1 @@ -76,15 +75,6 @@ sourceSize.width: Variables.notificationBarIconWidth; } - ColorOverlay { - id: _icon_overlay - anchors.fill: _icon; - source: _icon; - color: _root.backgroundColor; - cached: true; - antialiasing: true; - } - Text { id: _text color : Colors.textNotificationNoneFg anchors.centerIn : parent @@ -96,22 +86,13 @@ Image { id: _bell source: isSilenced ? "qrc:/images/bell-off.svg" : "qrc:/images/bell.svg" - anchors.left: _text.right - anchors.leftMargin: Variables.notificationBarIconMargin; + anchors.left: _root.left + anchors.leftMargin: Variables.silenceIconMargin; anchors.verticalCenter: parent.verticalCenter; sourceSize.height: Variables.notificationBarIconHeight; sourceSize.width: Variables.notificationBarIconWidth; } - ColorOverlay { - id: _bell_overlay - anchors.fill: _bell; - source: _bell; - color: Colors.textMain; - cached: true; - antialiasing: true; - } - Text { id: _timeout_text color : Colors.textMain; anchors.left : _bell.right Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r4cc6eda58284316d2245ec950a643d54520170c4 -reea7f072f684a611d54f86b14c9d68e316bba0c6 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 4cc6eda58284316d2245ec950a643d54520170c4) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision eea7f072f684a611d54f86b14c9d68e316bba0c6) @@ -14,7 +14,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 // Project // Qml imports @@ -69,15 +68,6 @@ sourceSize.width: Variables.dialogSVGWidth; } - ColorOverlay { - id: _icon_overlay - anchors.fill: _icon; - source: _icon; - color: _root.backgroundColor; - cached: true; - antialiasing: true; - } - Text { id: _title color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r5c9b16612ce300bba9c6f5a8c04f88a4bd67fefa -reea7f072f684a611d54f86b14c9d68e316bba0c6 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5c9b16612ce300bba9c6f5a8c04f88a4bd67fefa) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision eea7f072f684a611d54f86b14c9d68e316bba0c6) @@ -80,6 +80,7 @@ readonly property int durationResolution : 15 // PRS346 + readonly property int silenceIconMargin : 20 readonly property int notificationBarIconMargin : 10 readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30