mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-07-14 02:54:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(tracker): hide playing row indicator when not playing

Browse Source
This commit is contained in:
vsariola
2021-01-07 13:15:57 +02:00
parent e7cd1b295b
commit 8b23fb5c05
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tracker/layout.go
View File

@ -23,6 +23,11 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
t.playRowPatMutex.RLock() t.playRowPatMutex.RLock()
defer t.playRowPatMutex.RUnlock() defer t.playRowPatMutex.RUnlock()
playPat := t.PlayPattern
if !t.Playing {
playPat = -1
}
for i, trk := range t.song.Tracks { for i, trk := range t.song.Tracks {
flexTracks[i] = layout.Rigid(Lowered(t.layoutTrack( flexTracks[i] = layout.Rigid(Lowered(t.layoutTrack(
trk.Patterns, trk.Patterns,
@ -32,7 +37,7 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
t.DisplayPattern, t.DisplayPattern,
t.CursorColumn, t.CursorColumn,
t.PlayRow, t.PlayRow,
t.PlayPattern, playPat,
))) )))
} }
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
@ -43,13 +48,19 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
func (t *Tracker) layoutControls(gtx layout.Context) layout.Dimensions { func (t *Tracker) layoutControls(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min.Y = 200 gtx.Constraints.Min.Y = 200
gtx.Constraints.Max.Y = 200 gtx.Constraints.Max.Y = 200
playPat := t.PlayPattern
if !t.Playing {
playPat = -1
}
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(Raised(t.layoutPatterns( layout.Rigid(Raised(t.layoutPatterns(
t.song.Tracks, t.song.Tracks,
t.ActiveTrack, t.ActiveTrack,
t.DisplayPattern, t.DisplayPattern,
t.CursorColumn, t.CursorColumn,
t.PlayPattern, playPat,
))), ))),
layout.Rigid(t.darkLine(false)), layout.Rigid(t.darkLine(false)),
layout.Flexed(1, Raised(Label(fmt.Sprintf("Current octave: %v", t.CurrentOctave), white))), layout.Flexed(1, Raised(Label(fmt.Sprintf("Current octave: %v", t.CurrentOctave), white))),

2
tracker/tracker.go
View File

@ -62,6 +62,8 @@ func (t *Tracker) TogglePlay() {
t.Playing = !t.Playing t.Playing = !t.Playing
if t.Playing { if t.Playing {
t.NoteTracking = true t.NoteTracking = true
t.PlayPattern = t.DisplayPattern
t.PlayRow = t.CursorRow - 1
} }
} }