owen/supersonic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweak inactive lyric color

Browse Source
This commit is contained in:
Drew Weymouth
2024-05-26 07:46:15 -07:00
parent db38e1a3f4
commit f97bdf23c2
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/theme/theme.go
+13 -8
View File
@@ -110,14 +110,7 @@ func (m *MyTheme) Color(name fyne.ThemeColorName, _ fyne.ThemeVariant) color.Col
// average the Foreground and Disabled colors // average the Foreground and Disabled colors
foreground := colorOrDefault(colors.Foreground, defColors.Foreground, theme.ColorNameForeground, variant) foreground := colorOrDefault(colors.Foreground, defColors.Foreground, theme.ColorNameForeground, variant)
disabled := colorOrDefault(colors.Disabled, defColors.Disabled, theme.ColorNameDisabled, variant) disabled := colorOrDefault(colors.Disabled, defColors.Disabled, theme.ColorNameDisabled, variant)
pr, pg, pb, pa := foreground.RGBA() return blendColors(foreground, disabled, 0.33)
dr, dg, db, da := disabled.RGBA()
rAvg := uint8((pr/257 + dr/257) / 2)
gAvg := uint8((pg/257 + dg/257) / 2)
bAvg := uint8((pb/257 + db/257) / 2)
aAvg := uint8((pa/257 + da/257) / 2)
return color.RGBA{R: rAvg, G: gAvg, B: bAvg, A: aAvg}
case ColorNameListHeader: case ColorNameListHeader:
return colorOrDefault(colors.ListHeader, defColors.ListHeader, name, variant) return colorOrDefault(colors.ListHeader, defColors.ListHeader, name, variant)
case ColorNamePageBackground: case ColorNamePageBackground:
@@ -251,6 +244,18 @@ func (m *MyTheme) getVariant() fyne.ThemeVariant {
return fyne.CurrentApp().Settings().ThemeVariant() return fyne.CurrentApp().Settings().ThemeVariant()
} }
func blendColors(a, b color.Color, fractionA float64) color.Color {
ra, ga, ba, aa := a.RGBA()
rb, gb, bb, ab := b.RGBA()
fractionB := 1 - fractionA
rAvg := uint8(float64(ra/257)*fractionA + float64(rb/257)*fractionB)
gAvg := uint8(float64(ga/257)*fractionA + float64(gb/257)*fractionB)
bAvg := uint8(float64(ba/257)*fractionA + float64(bb/257)*fractionB)
aAvg := uint8(float64(aa/257)*fractionA + float64(ab/257)*fractionB)
return color.RGBA{R: rAvg, G: gAvg, B: bAvg, A: aAvg}
}
func readTTFFile(filepath string) ([]byte, error) { func readTTFFile(filepath string) ([]byte, error) {
if !strings.HasSuffix(filepath, ".ttf") { if !strings.HasSuffix(filepath, ".ttf") {
err := errors.New("only .ttf fonts are supported") err := errors.New("only .ttf fonts are supported")