mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-05-28 03:10:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(gioui): in note editor, only step when user actually enters a note

Browse Source
This commit is contained in:
vsariola 2021-04-11 15:54:41 +03:00
parent 8c7349de12
commit a639e0c5e6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tracker/gioui/keyevent.go
View File

@ -379,18 +379,22 @@ func (t *Tracker) KeyEvent(w *app.Window, e key.Event) bool {
return true return true
} }
case tracker.EditTracks: case tracker.EditTracks:
step := false
if t.Song().Score.Tracks[t.Cursor().Track].Effect { if t.Song().Score.Tracks[t.Cursor().Track].Effect {
if iv, err := strconv.ParseInt(e.Name, 16, 8); err == nil { if iv, err := strconv.ParseInt(e.Name, 16, 8); err == nil {
t.NumberPressed(byte(iv)) t.NumberPressed(byte(iv))
step = true
} }
} else { } else {
if e.Name == "A" || e.Name == "1" { if e.Name == "A" || e.Name == "1" {
t.SetNote(0) t.SetNote(0)
step = true
} else { } else {
if val, ok := noteMap[e.Name]; ok { if val, ok := noteMap[e.Name]; ok {
if _, ok := t.KeyPlaying[e.Name]; !ok { if _, ok := t.KeyPlaying[e.Name]; !ok {
n := tracker.NoteAsValue(t.OctaveNumberInput.Value, val) n := tracker.NoteAsValue(t.OctaveNumberInput.Value, val)
t.SetNote(n) t.SetNote(n)
step = true
trk := t.Cursor().Track trk := t.Cursor().Track
start := t.Song().Score.FirstVoiceForTrack(trk) start := t.Song().Score.FirstVoiceForTrack(trk)
end := start + t.Song().Score.Tracks[trk].NumVoices end := start + t.Song().Score.Tracks[trk].NumVoices
@ -399,7 +403,7 @@ func (t *Tracker) KeyEvent(w *app.Window, e key.Event) bool {
} }
} }
} }
if !(t.NoteTracking() && t.player.Playing()) && t.Step.Value > 0 { if step && !(t.NoteTracking() && t.player.Playing()) && t.Step.Value > 0 {
t.SetCursor(t.Cursor().AddRows(t.Step.Value)) t.SetCursor(t.Cursor().AddRows(t.Step.Value))
t.SetSelectionCorner(t.Cursor()) t.SetSelectionCorner(t.Cursor())
} }