Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support theme and image directory #12

Merged
merged 7 commits into from
Sep 17, 2019
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
More readable in loadThemeFromDir
Cosmetic changes?
  • Loading branch information
tobynet committed Sep 16, 2019
commit 38e59679cc813740ac6c58a4d0e2a3694231806d
27 changes: 13 additions & 14 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,22 +86,21 @@ func (t *Theme) loadTheme(themeName string) error {
}

func (t *Theme) loadThemeFromDir(dir string) error {
resources := []struct {
img *image.Image
glob string
}{
{&t.Head, "*1.png"},
{&t.Body, "*2.png"},
{&t.Tail, "*3.png"},
}
var err error

for _, v := range resources {
img, err := loadImageGlob(dir, v.glob)
if err != nil {
return err
}
*v.img = img
t.Head, err = loadImageGlob(dir, "*1.png")
if err != nil {
return err
}
t.Body, err = loadImageGlob(dir, "*2.png")
if err != nil {
return err
}
t.Tail, err = loadImageGlob(dir, "*3.png")
if err != nil {
return err
}

return nil
}
mattn marked this conversation as resolved.
Show resolved Hide resolved

Expand Down