Skip to content

fix: remove SystemPalette and use hardcoded colors in sidebar #764

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
Aug 26, 2026
+8 −13
Merged

fix: remove SystemPalette and use hardcoded colors in sidebar #764

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
9 changes: 2 additions & 7 deletions src/music-player/musicbaseandsonglist/SideBarItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Copyright (C) 2022-2026 UnionTech Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -23,10 +22,6 @@ ColumnLayout {
id: control
spacing: 10
Layout.leftMargin: 10
SystemPalette {
id: systemPalette
colorGroup: SystemPalette.Active
}

Rectangle {
id: siderTitle
Expand All @@ -38,7 +33,7 @@ ColumnLayout {
width: 42; height: 20
anchors.left: parent.left
anchors.leftMargin: 10
color: systemPalette.placeholderText
color: DTK.themeType === ApplicationHelper.DarkType ? Qt.rgba(247, 247, 247, 0.7) : Qt.rgba(0, 0, 0, 0.7)
text: title
font: DTK.fontManager.t6
horizontalAlignment: Qt.AlignLeft
Expand Down
12 changes: 6 additions & 6 deletions src/music-player/musicbaseandsonglist/SideBarItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import org.deepin.dtk 1.0

ItemDelegate {
property string type: "library"
readonly property color foregroundColor: checked ? systemPalette.highlightedText
: systemPalette.windowText
readonly property color foregroundColor: {
if (checked) {
return DTK.themeType === ApplicationHelper.DarkType ? "#FFFFFF" : "#FFFFFF"
}
return DTK.themeType === ApplicationHelper.DarkType ? "#B2F7F7F7" : "#000000"
}
id: item
checked: globalVariant !== undefined && globalVariant.curListPage === model.uuid
palette.buttonText: foregroundColor
SystemPalette {
id: systemPalette
colorGroup: SystemPalette.Active
}
// 屏蔽空格响应
Keys.onSpacePressed: { event.accepted=false; }
Keys.onReleased: { event.accepted=(event.key===Qt.Key_Space); }
Expand Down
Loading