Fix draw ordering

[micro.git] / cmd / micro / colorscheme.go

diff --git a/cmd/micro/colorscheme.go b/cmd/micro/colorscheme.go
index 91402c77e6793768f453a7c1ae3453ed63cc01eb..e57fabeb329ae6a9e070cb1308f3d7a99696fe59 100644 (file)
--- a/cmd/micro/colorscheme.go
+++ b/cmd/micro/colorscheme.go
@@ -2,8 +2,7 @@ package main
 
 import (
        "fmt"
-       "github.com/gdamore/tcell"
-       "github.com/mitchellh/go-homedir"
+       "github.com/zyedidia/tcell"
        "io/ioutil"
        "regexp"
        "strconv"
@@ -16,21 +15,16 @@ type Colorscheme map[string]tcell.Style
 // The current colorscheme
 var colorscheme Colorscheme
 
-var preInstalledColors = [3]string{"default", "solarized", "solarized-tc"}
+var preInstalledColors = []string{"default", "solarized", "solarized-tc", "atom-dark-tc", "monokai"}
 
 // InitColorscheme picks and initializes the colorscheme when micro starts
 func InitColorscheme() {
        LoadDefaultColorscheme()
 }
 
-// LoadDefaultColorscheme loads the default colorscheme from ~/.micro/colorschemes
+// LoadDefaultColorscheme loads the default colorscheme from $(configDir)/colorschemes
 func LoadDefaultColorscheme() {
-       dir, err := homedir.Dir()
-       if err != nil {
-               TermMessage("Error finding your home directory\nCan't load runtime files")
-               return
-       }
-       LoadColorscheme(settings.Colorscheme, dir+"/.micro/colorschemes")
+       LoadColorscheme(settings["colorscheme"].(string), configDir+"/colorschemes")
 }
 
 // LoadColorscheme loads the given colorscheme from a directory
@@ -52,6 +46,7 @@ func LoadColorscheme(colorschemeName, dir string) {
                        data, err := Asset("runtime/colorschemes/" + name + ".micro")
                        if err != nil {
                                TermMessage("Unable to load pre-installed colorscheme " + name)
+                               continue
                        }
                        colorscheme = ParseColorscheme(string(data))
                }
@@ -105,7 +100,7 @@ func StringToStyle(str string) tcell.Style {
        fg = strings.TrimSpace(fg)
        bg = strings.TrimSpace(bg)
 
-       style := tcell.StyleDefault.Foreground(StringToColor(fg)).Background(StringToColor(bg))
+       style := defStyle.Foreground(StringToColor(fg)).Background(StringToColor(bg))
        if strings.Contains(str, "bold") {
                style = style.Bold(true)
        }