From a506bb92ebc88edaacc63f3603a752cd0e630c9c Mon Sep 17 00:00:00 2001 From: sqshq Date: Sun, 28 Jul 2019 16:59:51 -0400 Subject: [PATCH] palette changes for windows support --- component/statusbar.go | 8 ++++---- console/palette.go | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/component/statusbar.go b/component/statusbar.go index c77eff5..a5f61a2 100644 --- a/component/statusbar.go +++ b/component/statusbar.go @@ -53,18 +53,18 @@ func NewStatusLine(configFileName string, palette console.Palette, license *meta func (s *StatusBar) Draw(buffer *ui.Buffer) { - buffer.Fill(ui.NewCell(' ', ui.NewStyle(console.ColorClear, console.MenuColorBackground)), s.GetRect()) + buffer.Fill(ui.NewCell(' ', ui.NewStyle(console.ColorClear, console.GetMenuColorReverse())), s.GetRect()) indent := bindingsIndent for _, binding := range s.keyBindings { - buffer.SetString(binding, ui.NewStyle(console.MenuColorText, console.MenuColorBackground), image.Pt(s.Max.X-len(binding)-indent, s.Min.Y)) + buffer.SetString(binding, ui.NewStyle(console.GetMenuColor(), console.GetMenuColorReverse()), image.Pt(s.Max.X-len(binding)-indent, s.Min.Y)) indent += bindingsIndent + len(binding) } - buffer.SetString(s.text, ui.NewStyle(console.MenuColorText, console.MenuColorBackground), s.Min) + buffer.SetString(s.text, ui.NewStyle(console.GetMenuColor(), console.GetMenuColorReverse()), s.Min) if s.pause { - buffer.SetString(pauseText, ui.NewStyle(console.MenuColorBackground, console.MenuColorText), image.Pt(s.Max.X-s.Dx()/2-len(pauseText)/2, s.Min.Y)) + buffer.SetString(pauseText, ui.NewStyle(console.GetMenuColorReverse(), console.GetMenuColor()), image.Pt(s.Max.X-s.Dx()/2-len(pauseText)/2, s.Min.Y)) } s.Block.Draw(buffer) diff --git a/console/palette.go b/console/palette.go index cab5d9a..d36f77d 100644 --- a/console/palette.go +++ b/console/palette.go @@ -3,6 +3,7 @@ package console import ( "fmt" ui "github.com/gizak/termui/v3" + "runtime" ) type Theme string @@ -31,8 +32,10 @@ const ( ) const ( - MenuColorBackground ui.Color = 235 - MenuColorText ui.Color = 255 + menuColorNix ui.Color = 255 + menuColorReverseNix ui.Color = 235 + menuColorWindows ui.Color = 255 + menuColorReverseWindows ui.Color = 0 ) type Palette struct { @@ -66,6 +69,24 @@ func GetPalette(theme Theme) Palette { } } +func GetMenuColor() ui.Color { + switch runtime.GOOS { + case "windows": + return menuColorWindows + default: + return menuColorNix + } +} + +func GetMenuColorReverse() ui.Color { + switch runtime.GOOS { + case "windows": + return menuColorReverseWindows + default: + return menuColorReverseNix + } +} + func GetGradientColor(gradient []ui.Color, cur int, max int) ui.Color { ratio := float64(len(gradient)) / float64(max) index := int(ratio * float64(cur))