mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-06-04 01:28:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(tracker): make sequencer show properly cursor, current playing row & pattern marker

Browse Source
This commit is contained in:
vsariola 2021-01-10 16:11:29 +02:00
parent 37185c98b3
commit 33bd91764c
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tracker/patterns.go
View File

@ -3,6 +3,7 @@ package tracker
import ( import (
"fmt" "fmt"
"image" "image"
"strings"
"gioui.org/f32" "gioui.org/f32"
"gioui.org/layout" "gioui.org/layout"
@ -15,36 +16,34 @@ import (
const patternCellHeight = 16 const patternCellHeight = 16
const patternCellWidth = 16 const patternCellWidth = 16
const patternVisibleTracks = 8
const patternRowMarkerWidth = 30
func (t *Tracker) layoutPatterns(tracks []sointu.Track, activeTrack, cursorPattern, cursorCol, playingPattern int) layout.Widget { func (t *Tracker) layoutPatterns(tracks []sointu.Track, activeTrack, cursorPattern, cursorCol, playingPattern int) layout.Widget {
return func(gtx layout.Context) layout.Dimensions { return func(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min.X = patternCellWidth * len(tracks) gtx.Constraints.Min.X = patternCellWidth*patternVisibleTracks + patternRowMarkerWidth
gtx.Constraints.Max.X = patternCellWidth * len(tracks) gtx.Constraints.Max.X = patternCellWidth*patternVisibleTracks + patternRowMarkerWidth
defer op.Push(gtx.Ops).Pop() defer op.Push(gtx.Ops).Pop()
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops) clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops)
paint.FillShape(gtx.Ops, patternSurfaceColor, clip.Rect{Max: image.Pt(gtx.Constraints.Max.X, trackRowHeight)}.Op()) paint.FillShape(gtx.Ops, patternSurfaceColor, clip.Rect{Max: image.Pt(gtx.Constraints.Max.X, gtx.Constraints.Max.Y)}.Op())
for i, track := range tracks { for j := range tracks[0].Sequence {
pop := op.Push(gtx.Ops) if j == playingPattern {
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops) paint.FillShape(gtx.Ops, patternPlayColor, clip.Rect{Max: image.Pt(gtx.Constraints.Max.X, patternCellHeight)}.Op())
if activeTrack == i {
paint.FillShape(gtx.Ops, activeTrackColor, clip.Rect{
Max: gtx.Constraints.Max,
}.Op())
} }
for j, p := range track.Sequence { paint.ColorOp{Color: rowMarkerPatternTextColor}.Add(gtx.Ops)
if j == playingPattern { widget.Label{}.Layout(gtx, textShaper, trackerFont, trackerFontSize, strings.ToUpper(fmt.Sprintf("%02x", j)))
paint.FillShape(gtx.Ops, patternPlayColor, clip.Rect{Max: image.Pt(trackWidth, trackRowHeight)}.Op()) stack := op.Push(gtx.Ops)
op.Offset(f32.Pt(patternRowMarkerWidth, 0)).Add(gtx.Ops)
for i, track := range tracks {
paint.ColorOp{Color: trackerTextColor}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, textShaper, trackerFont, trackerFontSize, fmt.Sprintf("%d", track.Sequence[j]))
if activeTrack == i && j == cursorPattern {
paint.FillShape(gtx.Ops, patternCursorColor, clip.Rect{Max: image.Pt(patternCellWidth, patternCellHeight)}.Op())
} }
if j == cursorPattern { op.Offset(f32.Pt(patternCellWidth, 0)).Add(gtx.Ops)
paint.ColorOp{Color: trackerActiveTextColor}.Add(gtx.Ops)
} else {
paint.ColorOp{Color: trackerTextColor}.Add(gtx.Ops)
}
widget.Label{}.Layout(gtx, textShaper, trackerFont, trackerFontSize, fmt.Sprintf("%d", p))
op.Offset(f32.Pt(0, patternCellHeight)).Add(gtx.Ops)
} }
pop.Pop() stack.Pop()
op.Offset(f32.Pt(patternCellWidth, 0)).Add(gtx.Ops) op.Offset(f32.Pt(0, patternCellHeight)).Add(gtx.Ops)
} }
return layout.Dimensions{Size: gtx.Constraints.Max} return layout.Dimensions{Size: gtx.Constraints.Max}
} }

1
tracker/theme.go
View File

@ -77,6 +77,7 @@ var patternTextColor = white
var patternActiveTextColor = yellow var patternActiveTextColor = yellow
var patternFont = fontCollection[6].Font var patternFont = fontCollection[6].Font
var patternFontSize = unit.Px(12) var patternFontSize = unit.Px(12)
var patternCursorColor = color.RGBA{R: 38, G: 79, B: 120, A: 64}
var inactiveBtnColor = color.RGBA{R: 61, G: 55, B: 55, A: 255} var inactiveBtnColor = color.RGBA{R: 61, G: 55, B: 55, A: 255}