Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix message text color. Fixes #82

Browse Source
This commit is contained in:
Tulir Asokan 2019-06-16 17:14:17 +03:00
parent eb2726e8df
commit 967db30762
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/messages/htmlmessage.go
View File

@ -29,6 +29,7 @@ import (
type HTMLMessage struct { type HTMLMessage struct {
Root html.Entity Root html.Entity
FocusedBg tcell.Color FocusedBg tcell.Color
TextColor tcell.Color
focused bool focused bool
} }
@ -49,7 +50,16 @@ func (hw *HTMLMessage) Clone() MessageRenderer {
func (hw *HTMLMessage) Draw(screen mauview.Screen) { func (hw *HTMLMessage) Draw(screen mauview.Screen) {
if hw.focused { if hw.focused {
screen.SetStyle(tcell.StyleDefault.Background(hw.FocusedBg)) screen.SetStyle(tcell.StyleDefault.Background(hw.FocusedBg).Foreground(hw.TextColor))
}
if hw.TextColor != tcell.ColorDefault {
hw.Root.AdjustStyle(func(style tcell.Style) tcell.Style {
fg, _, _ := style.Decompose()
if fg == tcell.ColorDefault {
return style.Foreground(hw.TextColor)
}
return style
})
} }
screen.Clear() screen.Clear()
hw.Root.Draw(screen) hw.Root.Draw(screen)
@ -81,6 +91,7 @@ func (hw *HTMLMessage) CalculateBuffer(preferences config.UserPreferences, width
} }
// TODO account for bare messages in initial startX // TODO account for bare messages in initial startX
startX := 0 startX := 0
hw.TextColor = msg.TextColor()
hw.Root.CalculateBuffer(width, startX, preferences.BareMessageView) hw.Root.CalculateBuffer(width, startX, preferences.BareMessageView)
} }