Skip to content

style: replace shadows with borders in OSD notifications #1442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Feb 9, 2026
+50 −52
Merged

style: replace shadows with borders in OSD notifications #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions panels/notification/osd/displaymode/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,7 @@ AppletItem {
}
property D.Palette checkedBackgroundColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.6)
normalDark: Qt.rgba(0, 0, 0, 0.6)
}
property D.Palette dropShadowColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
normalDark: Qt.rgba(0, 0, 0, 0.7)
}
property D.Palette innerShadowColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.2)
normalDark: Qt.rgba(1, 1, 1, 0.03)
normalDark: Qt.rgba(0, 0, 0, 0.5)
}

property bool isCurrent: Applet.currentPlanItem && Applet.currentPlanItem.key === model.key
Expand Down Expand Up @@ -126,26 +118,33 @@ AppletItem {
color: itemView.isCurrent ? itemView.D.ColorSelector.checkedBackgroundColor
: itemView.D.ColorSelector.backgroundColor
}
D.BoxShadow {
visible: !itemView.isCurrent
D.InsideBoxBorder {
property D.Palette insideBorderColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.1)
normalDark: Qt.rgba(1, 1, 1, 0.05)
}
property D.Palette checkedInsideBorderColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.15)
normalDark: Qt.rgba(1, 1, 1, 0.08)
}
radius: backgroundRect.radius
anchors.fill: parent
shadowOffsetX: 0
shadowOffsetY: 1
shadowColor: itemView.D.ColorSelector.dropShadowColor
shadowBlur: 1
cornerRadius: backgroundRect.radius
spread: 0
hollow: true
color: itemView.isCurrent ? D.ColorSelector.checkedInsideBorderColor
: D.ColorSelector.insideBorderColor
}
D.BoxInsetShadow {
visible: !itemView.isCurrent
D.OutsideBoxBorder {
property D.Palette outsideBorderColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.05)
normalDark: Qt.rgba(0, 0, 0, 0.4)
}
property D.Palette checkedOutsideBorderColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
Comment on lines +132 to +141
Copy link

@sourcery-ai sourcery-ai bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): The color bindings likely need to reference the item-specific ColorSelector (itemView.D.ColorSelector) rather than the global D.ColorSelector.

Elsewhere in this file, ColorSelector is accessed as itemView.D.ColorSelector.*, implying it’s scoped to itemView. Using D.ColorSelector.* here may either not resolve or use a different/global instance. Please update these bindings to itemView.D.ColorSelector.checkedInsideBorderColor / itemView.D.ColorSelector.insideBorderColor (and the outside border equivalents) to match the background color binding and ensure consistent behavior.

normalDark: Qt.rgba(0, 0, 0, 0.45)
}
radius: backgroundRect.radius
anchors.fill: parent
shadowOffsetX: 0
shadowOffsetY: 1
shadowBlur: 1
spread: 0
cornerRadius: backgroundRect.radius
shadowColor: itemView.D.ColorSelector.innerShadowColor
color: itemView.isCurrent ? D.ColorSelector.checkedOutsideBorderColor
: D.ColorSelector.outsideBorderColor
}
}
}
Expand Down
51 changes: 25 additions & 26 deletions panels/notification/osd/windoweffect/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,7 @@ AppletItem {
}
property D.Palette checkedBackgroundColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.6)
normalDark: Qt.rgba(0, 0, 0, 0.6)
}
property D.Palette dropShadowColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
normalDark: Qt.rgba(0, 0, 0, 0.7)
}
property D.Palette innerShadowColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.2)
normalDark: Qt.rgba(1, 1, 1, 0.03)
normalDark: Qt.rgba(0, 0, 0, 0.5)
}

contentItem: RowLayout {
Expand Down Expand Up @@ -175,26 +167,33 @@ AppletItem {
color: itemView.isCurrent ? itemView.D.ColorSelector.checkedBackgroundColor
: itemView.D.ColorSelector.backgroundColor
}
D.BoxShadow {
visible: !itemView.isCurrent
D.InsideBoxBorder {
property D.Palette insideBorderColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.1)
normalDark: Qt.rgba(1, 1, 1, 0.05)
}
property D.Palette checkedInsideBorderColor: D.Palette {
normal: Qt.rgba(1, 1, 1, 0.15)
normalDark: Qt.rgba(1, 1, 1, 0.08)
}
radius: backgroundRect.radius
anchors.fill: parent
shadowOffsetX: 0
shadowOffsetY: 1
shadowColor: itemView.D.ColorSelector.dropShadowColor
shadowBlur: 1
cornerRadius: backgroundRect.radius
spread: 0
hollow: true
color: itemView.isCurrent ? D.ColorSelector.checkedInsideBorderColor
: D.ColorSelector.insideBorderColor
}
D.BoxInsetShadow {
visible: !itemView.isCurrent
D.OutsideBoxBorder {
property D.Palette outsideBorderColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.05)
normalDark: Qt.rgba(0, 0, 0, 0.4)
}
property D.Palette checkedOutsideBorderColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.1)
Comment on lines +181 to +190
Copy link

@sourcery-ai sourcery-ai bot Feb 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): Color bindings should probably reference the attached ColorSelector on itemView, not a global D.ColorSelector.

The existing background color bindings use itemView.D.ColorSelector.*, implying the ColorSelector is attached to itemView. These new bindings switch to D.ColorSelector.*, which may reference a different (or no) palette and could cause theming issues or runtime failures. Please update these to itemView.D.ColorSelector.checkedInsideBorderColor / itemView.D.ColorSelector.insideBorderColor (and the outside variants) to stay consistent with the current pattern.

normalDark: Qt.rgba(0, 0, 0, 0.45)
}
radius: backgroundRect.radius
anchors.fill: parent
shadowOffsetX: 0
shadowOffsetY: 1
shadowBlur: 1
spread: 0
cornerRadius: backgroundRect.radius
shadowColor: itemView.D.ColorSelector.innerShadowColor
color: itemView.isCurrent ? D.ColorSelector.checkedOutsideBorderColor
: D.ColorSelector.outsideBorderColor
}
}
}
Expand Down
Loading