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

feat(tracker): improve unit parameter sliders: align, scrollable list & show values

Browse Source
This commit is contained in:
vsariola 2021-02-07 14:28:57 +02:00
parent 5588d7ca7d
commit 56d8ca574e
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tracker/tracker.go
View File

@ -51,6 +51,7 @@ type Tracker struct {
FileMenuBtn *widget.Clickable
FileMenuVisible bool
ParameterSliders []*widget.Float
ParameterList *layout.List
UnitDragList *DragList
DeleteUnitBtn *widget.Clickable
ClearUnitBtn *widget.Clickable
@ -477,6 +478,7 @@ func New(audioContext sointu.AudioContext, synthService sointu.SynthService) *Tr
undoStack: []sointu.Song{},
redoStack: []sointu.Song{},
InstrumentDragList: &DragList{List: &layout.List{Axis: layout.Horizontal}},
ParameterList: &layout.List{Axis: layout.Vertical},
TopHorizontalSplit: new(Split),
BottomHorizontalSplit: new(Split),
VerticalSplit: new(Split),

59
tracker/uniteditor.go
View File

@ -1,9 +1,9 @@
package tracker
import (
"fmt"
"image"
"image/color"
"sort"
"gioui.org/layout"
"gioui.org/op"
@ -12,6 +12,7 @@ import (
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"
"github.com/vsariola/sointu"
"golang.org/x/exp/shiny/materialdesign/icons"
)
@ -28,42 +29,40 @@ func (t *Tracker) layoutUnitEditor(gtx C) D {
}
func (t *Tracker) layoutUnitSliders(gtx C) D {
params := t.song.Patch.Instruments[t.CurrentInstrument].Units[t.CurrentUnit].Parameters
count := len(params)
children := make([]layout.FlexChild, 0, count)
if len(t.ParameterSliders) < count {
tail := make([]*widget.Float, count-len(t.ParameterSliders))
for t := range tail {
tail[t] = new(widget.Float)
ut, ok := sointu.UnitTypes[t.song.Patch.Instruments[t.CurrentInstrument].Units[t.CurrentUnit].Type]
if !ok {
return layout.Dimensions{}
}
listElements := func(gtx C, index int) D {
if ut[index].MaxValue < ut[index].MinValue {
return layout.Dimensions{}
}
t.ParameterSliders = append(t.ParameterSliders, tail...)
}
keys := make([]string, 0, len(params))
for k := range params {
keys = append(keys, k)
}
sort.Strings(keys)
for i, k := range keys {
for t.ParameterSliders[i].Changed() {
params[k] = int(t.ParameterSliders[i].Value)
for len(t.ParameterSliders) <= index {
t.ParameterSliders = append(t.ParameterSliders, new(widget.Float))
}
params := t.song.Patch.Instruments[t.CurrentInstrument].Units[t.CurrentUnit].Parameters
for t.ParameterSliders[index].Changed() {
params[ut[index].Name] = int(t.ParameterSliders[index].Value)
// TODO: tracker should have functions to update parameters and
// to do this efficiently i.e. not compile the whole patch again
t.LoadSong(t.song)
}
t.ParameterSliders[i].Value = float32(params[k])
sliderStyle := material.Slider(t.Theme, t.ParameterSliders[i], 0, 128)
t.ParameterSliders[index].Value = float32(params[ut[index].Name])
sliderStyle := material.Slider(t.Theme, t.ParameterSliders[index], float32(ut[index].MinValue), float32(ut[index].MaxValue))
sliderStyle.Color = t.Theme.Fg
k2 := k // avoid k changing in the closure
children = append(children, layout.Rigid(func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(Label(k2, white)),
layout.Rigid(func(gtx C) D {
gtx.Constraints.Min.X = 200
return sliderStyle.Layout(gtx)
}))
}))
return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx C) D {
gtx.Constraints.Min.X = gtx.Px(unit.Dp(110))
return layout.E.Layout(gtx, Label(ut[index].Name, white))
}),
layout.Rigid(func(gtx C) D {
gtx.Constraints.Min.X = gtx.Px(unit.Dp(200))
return sliderStyle.Layout(gtx)
}),
layout.Rigid(Label(fmt.Sprintf("%v", params[ut[index].Name]), white)),
)
}
return layout.Flex{Axis: layout.Vertical}.Layout(gtx, children...)
return t.ParameterList.Layout(gtx, len(ut), listElements)
}
func (t *Tracker) layoutUnitFooter() layout.Widget {