Commit 60c0e156 authored by Tranter Madi's avatar Tranter Madi 🌧
Browse files

Move all hardcoded color in HeaderBar to one place

parent ad0b1c9c
Pipeline #64664 passed with stage
in 8 minutes and 23 seconds
......@@ -20,7 +20,6 @@ Rectangle {
property string album: headerData[0]
property string albumArtist: headerData[1]
property url imageUrl: headerData[2]
property alias textColor: mainLabel.color
property alias backgroundColor: background.color
implicitHeight: contentLayout.implicitHeight
......@@ -83,7 +82,6 @@ Rectangle {
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
text: albumArtist
color: mainLabel.color
elide: Text.ElideRight
wrapMode: Text.WordWrap
......
......@@ -140,6 +140,12 @@ FocusScope {
spacing: 0
// Hardcoded because the headerbar blur always makes a dark-ish
// background, so we don't want to use a color scheme color that
// might also be dark. This is the text color of Breeze
Kirigami.Theme.textColor: "#eff0f1"
GridLayout {
id: gridLayoutContent
......@@ -254,10 +260,6 @@ FocusScope {
Layout.maximumWidth: gridLayoutContent.width
horizontalAlignment: portrait? Text.AlignHCenter : Text.AlignLeft
elide: Text.ElideRight
// Hardcoded because the headerbar blur always makes a dark-ish
// background, so we don't want to use a color scheme color that
// might also be dark
color: "white"
level: 1
font.bold: true
......@@ -280,10 +282,6 @@ FocusScope {
Layout.maximumWidth: gridLayoutContent.width
horizontalAlignment: portrait? Text.AlignHCenter : Text.AlignLeft
elide: Text.ElideRight
// Hardcoded because the headerbar blur always makes a dark-ish
// background, so we don't want to use a color scheme color that
// might also be dark
color: "white"
level: 3
MouseArea {
......@@ -305,10 +303,6 @@ FocusScope {
Layout.maximumWidth: gridLayoutContent.width
horizontalAlignment: portrait? Text.AlignHCenter : Text.AlignLeft
elide: Text.ElideRight
// Hardcoded because the headerbar blur always makes a dark-ish
// background, so we don't want to use a color scheme color that
// might also be dark
color: "white"
level: 3
MouseArea {
......
......@@ -99,8 +99,7 @@ BasePlayListDelegate {
layer.enabled: simpleMode
layer.effect: ColorOverlay {
cached: true
color: myPalette.highlightedText
color: Kirigami.Theme.textColor
}
visible: isPlaying === MediaPlayList.IsPlaying || isPlaying === MediaPlayList.IsPaused
......@@ -130,7 +129,6 @@ BasePlayListDelegate {
}
font.weight: (isPlaying ? Font.Bold : Font.Normal)
color: simpleMode ? myPalette.highlightedText : myPalette.text
visible: isValid && !playIcon.visible
}
......@@ -142,7 +140,6 @@ BasePlayListDelegate {
text: title
font.weight: (isPlaying ? Font.Bold : Font.Normal)
color: simpleMode ? myPalette.highlightedText : myPalette.text
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
......@@ -158,8 +155,6 @@ BasePlayListDelegate {
text: title
color: simpleMode ? myPalette.highlightedText : myPalette.text
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
......@@ -255,7 +250,6 @@ BasePlayListDelegate {
text: duration
font.weight: (isPlaying ? Font.Bold : Font.Normal)
color: simpleMode ? myPalette.highlightedText : myPalette.text
Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
Layout.leftMargin: Kirigami.Units.largeSpacing
......
......@@ -35,8 +35,6 @@ ScrollView {
section.delegate: BasicPlayListAlbumHeader {
headerData: JSON.parse(section)
width: playListView.width
// In party mode, adjust the colors to be suitable for a dark background
textColor: myPalette.highlightedText
backgroundColor: "transparent"
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment