diff --git a/default.png b/default.png deleted file mode 100644 index 9298365..0000000 Binary files a/default.png and /dev/null differ diff --git a/layer_1.png b/layer_1.png deleted file mode 100644 index a5f9713..0000000 Binary files a/layer_1.png and /dev/null differ diff --git a/layer_2.png b/layer_2.png deleted file mode 100644 index a5f9713..0000000 Binary files a/layer_2.png and /dev/null differ diff --git a/main.go b/main.go index 6d52167..8aa549c 100644 --- a/main.go +++ b/main.go @@ -29,6 +29,12 @@ var keymap = map[string]hotkey.Key{ } func main() { + userConfigDir, _ := os.UserConfigDir() + appConfigDir := userConfigDir + "/keyboard-layer-display" + imageDir := appConfigDir + "/layers" + log.Println(imageDir) + os.MkdirAll(imageDir, 0755) + a := app.New() w := a.NewWindow("SysTray") @@ -46,29 +52,29 @@ func main() { Width: 1656 / 2, Height: 546 / 2, }) - defaultImage := canvas.NewImageFromFile("./default.png") + + defaultImage := canvas.NewImageFromFile(imageDir + "/default.png") + w.SetContent(container.NewPadded(defaultImage)) + + w.SetCloseIntercept(func() { + w.Hide() + }) layers := []Layer{} for i := range 5 { - imagePath := "./layer_" + strconv.Itoa(i+1) + ".png" + imagePath := imageDir + "/layer_" + strconv.Itoa(i+1) + ".png" if _, err := os.Stat(imagePath); errors.Is(err, os.ErrNotExist) { continue } newLayer := Layer{ Image: canvas.NewImageFromFile(imagePath), - Hotkey: keymap["KeyF"+strconv.Itoa(12+i)], + Hotkey: keymap["KeyF"+strconv.Itoa(13+i)], } layers = append(layers, newLayer) } - w.SetContent(container.NewPadded(defaultImage)) - - w.SetCloseIntercept(func() { - w.Hide() - }) - go func() { wg := sync.WaitGroup{} wg.Add(len(layers))