Skip to content

fix: incorrect windowText for osd #1078

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
Apr 7, 2025
Merged

fix: incorrect windowText for osd #1078

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
36 changes: 22 additions & 14 deletions panels/notification/osd/package/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,30 @@ Window {
property Item osdView
property bool isSingleView: false

Repeater {
model: Applet.appletItems
delegate: Loader {
active: modelData.update(Applet.osdType)
onActiveChanged: {
if (active) {
root.isSingleView = modelData.singleView
root.osdView = this
Control {
property D.Palette textColor: D.Palette {
normal: Qt.rgba(0, 0, 0, 1)
normalDark: Qt.rgba(1, 1, 1, 1)
}
palette.windowText: D.ColorSelector.textColor

Repeater {
model: Applet.appletItems
delegate: Loader {
active: modelData.update(Applet.osdType)
onActiveChanged: {
if (active) {
root.isSingleView = modelData.singleView
root.osdView = this
}
}
}

sourceComponent: Control {
contentItem: model.data
background: D.FloatingPanel {
implicitWidth: 100
implicitHeight: 40
sourceComponent: Control {
contentItem: model.data
background: D.FloatingPanel {
implicitWidth: 100
implicitHeight: 40
}
}
}
}
Expand Down
1 change: 1 addition & 0 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 @@ -138,6 +138,7 @@ AppletItem {
D.Label {
text: itemView.description
font: D.DTK.fontManager.t6
palette.windowText: D.DTK.palette.windowText
Layout.fillWidth: true
horizontalAlignment: Text.AlignLeft
Layout.maximumWidth: 298
Expand Down