diff --git a/panels/notification/osd/displaymode/package/icons/osd_display_copy.dci b/panels/notification/osd/displaymode/package/icons/osd_display_copy.dci index c87b00716..937c40f03 100644 Binary files a/panels/notification/osd/displaymode/package/icons/osd_display_copy.dci and b/panels/notification/osd/displaymode/package/icons/osd_display_copy.dci differ diff --git a/panels/notification/osd/displaymode/package/icons/osd_display_custom1.dci b/panels/notification/osd/displaymode/package/icons/osd_display_custom1.dci index 71100790a..84acda435 100644 Binary files a/panels/notification/osd/displaymode/package/icons/osd_display_custom1.dci and b/panels/notification/osd/displaymode/package/icons/osd_display_custom1.dci differ diff --git a/panels/notification/osd/displaymode/package/icons/osd_display_custom2.dci b/panels/notification/osd/displaymode/package/icons/osd_display_custom2.dci index ebed1c5ff..c5108895d 100644 Binary files a/panels/notification/osd/displaymode/package/icons/osd_display_custom2.dci and b/panels/notification/osd/displaymode/package/icons/osd_display_custom2.dci differ diff --git a/panels/notification/osd/displaymode/package/icons/osd_display_expansion.dci b/panels/notification/osd/displaymode/package/icons/osd_display_expansion.dci index c713175e2..0c9d83818 100644 Binary files a/panels/notification/osd/displaymode/package/icons/osd_display_expansion.dci and b/panels/notification/osd/displaymode/package/icons/osd_display_expansion.dci differ diff --git a/panels/notification/osd/displaymode/package/main.qml b/panels/notification/osd/displaymode/package/main.qml index 3196d375f..9f654ad20 100644 --- a/panels/notification/osd/displaymode/package/main.qml +++ b/panels/notification/osd/displaymode/package/main.qml @@ -57,8 +57,8 @@ AppletItem { palette.windowText: undefined property D.Palette backgroundColor: D.Palette { - normal: Qt.rgba(1, 1, 1, 0.4) - normalDark: Qt.rgba(0, 0, 0, 0.4) + normal: Qt.rgba(1, 1, 1, 0.3) + normalDark: Qt.rgba(0, 0, 0, 0.3) } property D.Palette checkedBackgroundColor: D.Palette { normal: Qt.rgba(1, 1, 1, 0.6) @@ -66,11 +66,11 @@ AppletItem { } property D.Palette dropShadowColor: D.Palette { normal: Qt.rgba(0, 0, 0, 0.1) - normalDark: Qt.rgba(1, 1, 1, 0.1) + normalDark: Qt.rgba(0, 0, 0, 0.7) } - property D.Palette innerShadowColor: D.Palette { + property D.Palette innerShadowColor: D.Palette { normal: Qt.rgba(1, 1, 1, 0.2) - normalDark: Qt.rgba(0, 0, 0, 0.2) + normalDark: Qt.rgba(1, 1, 1, 0.03) } property bool isCurrent: Applet.currentPlanItem && Applet.currentPlanItem.key === model.key @@ -95,7 +95,7 @@ AppletItem { font: D.DTK.fontManager.t5 Layout.alignment: Qt.AlignVCenter text: model.text - color: Applet.currentPlanItem && Applet.currentPlanItem.key === model.key ? D.DTK.platformTheme.activeColor : palette.windowText + color: palette.windowText } Item { @@ -125,6 +125,7 @@ AppletItem { : itemView.D.ColorSelector.backgroundColor } D.BoxShadow { + visible: !itemView.isCurrent anchors.fill: parent shadowOffsetX: 0 shadowOffsetY: 1 @@ -135,6 +136,7 @@ AppletItem { hollow: true } D.BoxInsetShadow { + visible: !itemView.isCurrent anchors.fill: parent shadowOffsetX: 0 shadowOffsetY: 1 diff --git a/panels/notification/osd/kblayout/package/main.qml b/panels/notification/osd/kblayout/package/main.qml index 1f57e71e4..9fda2bf3f 100644 --- a/panels/notification/osd/kblayout/package/main.qml +++ b/panels/notification/osd/kblayout/package/main.qml @@ -69,11 +69,11 @@ AppletItem { } property D.Palette dropShadowColor: D.Palette { normal: Qt.rgba(0, 0, 0, 0.1) - normalDark: Qt.rgba(1, 1, 1, 0.1) + normalDark: Qt.rgba(0, 0, 0, 0.7) } - property D.Palette innerShadowColor: D.Palette { + property D.Palette innerShadowColor: D.Palette { normal: Qt.rgba(1, 1, 1, 0.2) - normalDark: Qt.rgba(0, 0, 0, 0.2) + normalDark: Qt.rgba(1, 1, 1, 0.03) } property bool isCurrent: Applet.currentLayout === model.key diff --git a/panels/notification/osd/package/main.qml b/panels/notification/osd/package/main.qml index 19577a0b0..19260f55a 100644 --- a/panels/notification/osd/package/main.qml +++ b/panels/notification/osd/package/main.qml @@ -56,6 +56,19 @@ Window { background: D.FloatingPanel { implicitWidth: 100 implicitHeight: 40 + backgroundColor: D.Palette { + normal: Qt.rgba(247 / 255.0, 247 / 255.0, 247 / 255.0, 0.4) + normalDark: Qt.rgba(0, 0, 0, 0.6) + } + insideBorderColor: D.Palette { + normal: Qt.rgba(1, 0, 0, 0.3) + normalDark: Qt.rgba(1, 1, 1, 0.1) + } + outsideBorderColor: D.Palette { + normal: Qt.rgba(1, 1, 0, 0.1) + normalDark: Qt.rgba(0, 0, 0, 0.7) + } + dropShadowColor: null } } } diff --git a/panels/notification/osd/windoweffect/package/main.qml b/panels/notification/osd/windoweffect/package/main.qml index cbf05c24d..89e263d5e 100644 --- a/panels/notification/osd/windoweffect/package/main.qml +++ b/panels/notification/osd/windoweffect/package/main.qml @@ -85,10 +85,11 @@ AppletItem { required property string iconName required property string title required property string description + property bool isCurrent: control.selectIndex === itemView.index property D.Palette backgroundColor: D.Palette { - normal: Qt.rgba(1, 1, 1, 0.4) - normalDark: Qt.rgba(0, 0, 0, 0.4) + normal: Qt.rgba(1, 1, 1, 0.3) + normalDark: Qt.rgba(0, 0, 0, 0.3) } property D.Palette checkedBackgroundColor: D.Palette { normal: Qt.rgba(1, 1, 1, 0.6) @@ -96,11 +97,11 @@ AppletItem { } property D.Palette dropShadowColor: D.Palette { normal: Qt.rgba(0, 0, 0, 0.1) - normalDark: Qt.rgba(1, 1, 1, 0.1) + normalDark: Qt.rgba(0, 0, 0, 0.7) } - property D.Palette innerShadowColor: D.Palette { + property D.Palette innerShadowColor: D.Palette { normal: Qt.rgba(1, 1, 1, 0.2) - normalDark: Qt.rgba(0, 0, 0, 0.2) + normalDark: Qt.rgba(1, 1, 1, 0.03) } contentItem: RowLayout { @@ -155,7 +156,7 @@ AppletItem { width: 16 height: 16 } - visible: control.checkedIndex === itemView.index + visible: itemView.isCurrent Layout.alignment: Qt.AlignVCenter | Qt.AlignRight Layout.rightMargin: 10 name: "item_checked" @@ -169,10 +170,11 @@ AppletItem { id: backgroundRect anchors.fill: parent radius: 6 - color: control.selectIndex === itemView.index ? itemView.D.ColorSelector.checkedBackgroundColor + color: itemView.isCurrent ? itemView.D.ColorSelector.checkedBackgroundColor : itemView.D.ColorSelector.backgroundColor } D.BoxShadow { + visible: !itemView.isCurrent anchors.fill: parent shadowOffsetX: 0 shadowOffsetY: 1 @@ -183,6 +185,7 @@ AppletItem { hollow: true } D.BoxInsetShadow { + visible: !itemView.isCurrent anchors.fill: parent shadowOffsetX: 0 shadowOffsetY: 1