Fix some issues with default colors in colorschemes (#2225)

[micro.git] / internal / config / colorscheme.go

diff --git a/internal/config/colorscheme.go b/internal/config/colorscheme.go
index 5222cd54d4ac85a7325171296cf7837397eff3d5..4a2ef2f43127daa37ba4c71d833c5073e945c6a1 100644 (file)
--- a/internal/config/colorscheme.go
+++ b/internal/config/colorscheme.go
@@ -35,8 +35,6 @@ func GetColor(color string) tcell.Style {
                }
        } else if style, ok := Colorscheme[color]; ok {
                st = style
-       } else {
-               st = StringToStyle(color)
        }
 
        return st
@@ -131,12 +129,12 @@ func StringToStyle(str string) tcell.Style {
        bg = strings.TrimSpace(bg)
 
        var fgColor, bgColor tcell.Color
-       if fg == "" {
+       if fg == "" || fg == "default" {
                fgColor, _, _ = DefStyle.Decompose()
        } else {
                fgColor = StringToColor(fg)
        }
-       if bg == "" {
+       if bg == "" || bg == "default" {
                _, bgColor, _ = DefStyle.Decompose()
        } else {
                bgColor = StringToColor(bg)