Skip to content

Commit

Permalink
feat(tracker/gioui): preferences.yml for window size or maximized (#185)
Browse files Browse the repository at this point in the history
  • Loading branch information
qm210 authored Dec 7, 2024
1 parent 4169356 commit 7ff3c94
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 21 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
([#77][i77])
- User can define own keybindings in `os.UserConfigDir()/sointu/keybindings.yml`
([#94][i94], [#151][i151])
- User can define preferred window size in
`os.UserConfigDir()/sointu/preferences.yml` ([#184][i184])
- A small number above the instrument name identifies the MIDI channel /
instrument number, with numbering starting from 1 ([#154][i154])
- The filter unit frequency parameter is displayed in Hz, corresponding roughly
Expand Down
13 changes: 1 addition & 12 deletions tracker/gioui/keyevent.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package gioui
import (
_ "embed"
"fmt"
"os"
"path/filepath"
"strconv"
"strings"

Expand All @@ -28,16 +26,7 @@ var keyActionMap = map[KeyAction]string{} // holds an informative string of the

func loadCustomKeyBindings() []KeyBinding {
var keyBindings []KeyBinding
configDir, err := os.UserConfigDir()
if err != nil {
return nil
}
path := filepath.Join(configDir, "sointu", "keybindings.yml")
bytes, err := os.ReadFile(path)
if err != nil {
return nil
}
err = yaml.Unmarshal(bytes, &keyBindings)
_, err := ReadCustomConfigYml("keybindings.yml", &keyBindings)
if err != nil {
return nil
}
Expand Down
65 changes: 65 additions & 0 deletions tracker/gioui/preferences.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package gioui

import (
_ "embed"
"fmt"
"os"
"path/filepath"

"gopkg.in/yaml.v2"

"gioui.org/unit"
)

type (
Preferences struct {
Window WindowPreferences
YmlError error
}

WindowPreferences struct {
Width int
Height int
Maximized bool `yaml:",omitempty"`
}
)

//go:embed preferences.yml
var defaultPreferencesYaml []byte

func loadDefaultPreferences() Preferences {
var preferences Preferences
err := yaml.Unmarshal(defaultPreferencesYaml, &preferences)
if err != nil {
panic(fmt.Errorf("failed to unmarshal preferences: %w", err))
}
return preferences
}

// ReadCustomConfigYml modifies the target argument, i.e. needs a pointer
func ReadCustomConfigYml(filename string, target interface{}) (exists bool, err error) {
configDir, err := os.UserConfigDir()
if err != nil {
return false, err
}
path := filepath.Join(configDir, "sointu", filename)
bytes, err2 := os.ReadFile(path)
if err2 != nil {
return false, err2
}
err = yaml.Unmarshal(bytes, target)
return true, err
}

func MakePreferences() Preferences {
preferences := loadDefaultPreferences()
exists, err := ReadCustomConfigYml("preferences.yml", &preferences)
if exists {
preferences.YmlError = err
}
return preferences
}

func (p Preferences) WindowSize() (unit.Dp, unit.Dp) {
return unit.Dp(p.Window.Width), unit.Dp(p.Window.Height)
}
4 changes: 4 additions & 0 deletions tracker/gioui/preferences.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
window:
width: 800
height: 600
maximized: false
31 changes: 22 additions & 9 deletions tracker/gioui/tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"gioui.org/op/clip"
"gioui.org/op/paint"
"gioui.org/text"
"gioui.org/unit"
"gioui.org/widget/material"
"gioui.org/x/explorer"
"github.com/vsariola/sointu/tracker"
Expand Down Expand Up @@ -51,8 +50,9 @@ type (

filePathString tracker.String

quitWG sync.WaitGroup
execChan chan func()
quitWG sync.WaitGroup
execChan chan func()
preferences Preferences

*tracker.Model
}
Expand Down Expand Up @@ -89,9 +89,16 @@ func NewTracker(model *tracker.Model) *Tracker {
Model: model,

filePathString: model.FilePath().String(),
preferences: MakePreferences(),
}
t.Theme.Shaper = text.NewShaper(text.WithCollection(fontCollection))
t.PopupAlert = NewPopupAlert(model.Alerts(), t.Theme.Shaper)
if t.preferences.YmlError != nil {
model.Alerts().Add(
fmt.Sprintf("Preferences YML Error: %s", t.preferences.YmlError),
tracker.Warning,
)
}
t.Theme.Palette.Fg = primaryColor
t.Theme.Palette.ContrastFg = black
t.TrackEditor.scrollTable.Focus()
Expand All @@ -101,9 +108,7 @@ func NewTracker(model *tracker.Model) *Tracker {

func (t *Tracker) Main() {
titleFooter := ""
w := new(app.Window)
w.Option(app.Title("Sointu Tracker"))
w.Option(app.Size(unit.Dp(800), unit.Dp(600)))
w := t.newWindow()
t.InstrumentEditor.Focus()
recoveryTicker := time.NewTicker(time.Second * 30)
t.Explorer = explorer.NewExplorer(w)
Expand All @@ -127,9 +132,7 @@ func (t *Tracker) Main() {
}
if !t.Quitted() {
// TODO: uh oh, there's no way of canceling the destroyevent in gioui? so we create a new window just to show the dialog
w = new(app.Window)
w.Option(app.Title("Sointu Tracker"))
w.Option(app.Size(unit.Dp(800), unit.Dp(600)))
w = t.newWindow()
t.Explorer = explorer.NewExplorer(w)
go eventLoop(w, events, acks)
}
Expand Down Expand Up @@ -165,6 +168,16 @@ func (t *Tracker) Main() {
t.quitWG.Done()
}

func (t *Tracker) newWindow() *app.Window {
w := new(app.Window)
w.Option(app.Title("Sointu Tracker"))
w.Option(app.Size(t.preferences.WindowSize()))
if t.preferences.Window.Maximized {
w.Option(app.Maximized.Option())
}
return w
}

func eventLoop(w *app.Window, events chan<- event.Event, acks <-chan struct{}) {
// Iterate window events, sending each to the old event loop and waiting for
// a signal that processing is complete before iterating again.
Expand Down

0 comments on commit 7ff3c94

Please sign in to comment.