schobers/zntg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed colors of button text a bit.

Browse Source
This commit is contained in:
Sander Schobers 2020-12-12 14:46:06 +01:00
parent f4827fa200
commit c2e688cc68
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/button.go
View File

@ -155,6 +155,13 @@ func (b *Button) fillColor(p *Palette) color.Color {
return nil
}
func (b *Button) fontColor(c color.Color) color.Color {
if b.Font.Color == nil {
return c
}
return b.Font.Color
}
func (b *Button) textColor(p *Palette) color.Color {
if b.Disabled {
if b.Background != nil {
@ -166,22 +173,19 @@ func (b *Button) textColor(p *Palette) color.Color {
}
return b.disabledColor(p)
}
if b.Font.Color != nil {
return b.Font.Color
}
switch b.Type {
case ButtonTypeContained:
return p.TextOnPrimary
return b.fontColor(p.TextOnPrimary)
case ButtonTypeIcon:
if b.over {
if b.HoverColor != nil {
return b.HoverColor
}
return p.Primary
return b.fontColor(p.Primary)
}
return p.Text
return b.fontColor(p.Text)
default:
return p.Primary
return b.fontColor(p.Primary)
}
}