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

fix: changes after review (see PR #176)

Browse Source
This commit is contained in:
qm210
2024-11-09 18:58:42 +01:00
committed by Veikko Sariola
parent d517576a65
commit b255a68ebc
10 changed files with 252 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tracker/gioui/note_editor.go
View File

@ -293,7 +293,7 @@ func (te *NoteEditor) layoutTracks(gtx C, t *Tracker) D {
}
// draw the corresponding "fake cursors" for instrument-track-groups (for polyphony)
if hasTrackMidiIn {
for trackIndex := range t.Model.TracksWithSameInstrumentAsCurrent() {
for _, trackIndex := range t.Model.TracksWithSameInstrumentAsCurrent() {
if x == trackIndex && y == cursor.Y {
te.paintColumnCell(gtx, x, t, cursorNeighborForTrackMidiInColor)
}
@ -310,7 +310,7 @@ func (te *NoteEditor) layoutTracks(gtx C, t *Tracker) D {
paint.ColorOp{Color: trackerPatMarker}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, t.Theme.Shaper, trackerFont, trackerFontSize, patternIndexToString(s), op.CallOp{})
}
if row == 1 && t.Model.Notes().Unique(x, s) { // draw a * if the pattern is unique
if row == 1 && t.Model.PatternUnique(x, s) { // draw a * if the pattern is unique
paint.ColorOp{Color: mediumEmphasisTextColor}.Add(gtx.Ops)
widget.Label{}.Layout(gtx, t.Theme.Shaper, trackerFont, trackerFontSize, "*", op.CallOp{})
}

1
tracker/gioui/theme.go
View File

@ -74,3 +74,4 @@ var warningColor = color.NRGBA{R: 251, G: 192, B: 45, A: 255}
var dialogBgColor = color.NRGBA{R: 0, G: 0, B: 0, A: 224}
var paramIsSendTargetColor = color.NRGBA{R: 120, G: 120, B: 210, A: 255}
var paramValueInvalidColor = color.NRGBA{R: 120, G: 120, B: 120, A: 190}

79
tracker/gioui/unit_editor.go
View File

@ -14,16 +14,14 @@ import (
"gioui.org/widget"
"gioui.org/widget/material"
"gioui.org/x/component"
sointu "github.com/vsariola/sointu"
"github.com/vsariola/sointu"
"github.com/vsariola/sointu/tracker"
"golang.org/x/exp/shiny/materialdesign/icons"
"golang.org/x/text/cases"
"golang.org/x/text/language"
"image"
"io"
"iter"
"math"
"slices"
)
type UnitEditor struct {
@ -252,7 +250,6 @@ type ParameterStyle struct {
Theme *material.Theme
SendTargetTheme *material.Theme
Focus bool
sends []sointu.Unit
}
func (t *Tracker) ParamStyle(th *material.Theme, paramWidget *ParameterWidget) ParameterStyle {
@ -271,7 +268,7 @@ func (t *Tracker) ParamStyle(th *material.Theme, paramWidget *ParameterWidget) P
}
func (p ParameterStyle) Layout(gtx C) D {
sends := slices.Collect(p.findSends())
isSendTarget, info := p.tryDerivedParameterInfo()
return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx C) D {
gtx.Constraints.Min.X = gtx.Dp(unit.Dp(110))
@ -302,7 +299,7 @@ func (p ParameterStyle) Layout(gtx C) D {
}
sliderStyle := material.Slider(p.Theme, &p.w.floatWidget)
sliderStyle.Color = p.Theme.Fg
if len(sends) > 0 {
if isSendTarget {
sliderStyle.Color = paramIsSendTargetColor
}
r := image.Rectangle{Max: gtx.Constraints.Min}
@ -348,16 +345,14 @@ func (p ParameterStyle) Layout(gtx C) D {
var unitItems []MenuItem
instrName := "<instr>"
unitName := "<unit>"
targetI, targetU, err := p.tracker.FindUnit(p.w.Parameter.Value())
if err == nil {
targetInstrument := p.tracker.Instrument(targetI)
instrName = targetInstrument.Name
units := targetInstrument.Units
unitName = unitNameFor(targetU, units[targetU])
targetInstrName, units, targetUnitIndex, ok := p.tracker.UnitInfo(p.w.Parameter.Value())
if ok {
instrName = targetInstrName
unitName = buildUnitLabel(targetUnitIndex, units[targetUnitIndex])
unitItems = make([]MenuItem, len(units))
for j, unit := range units {
id := unit.ID
unitItems[j].Text = unitNameFor(j, unit)
unitItems[j].Text = buildUnitLabel(j, unit)
unitItems[j].IconBytes = icons.NavigationChevronRight
unitItems[j].Doer = tracker.Allow(func() {
tracker.Int{IntData: p.w.Parameter}.Set(id)
@ -378,8 +373,12 @@ func (p ParameterStyle) Layout(gtx C) D {
}),
layout.Rigid(func(gtx C) D {
if p.w.Parameter.Type() != tracker.IDParameter {
label := Label(p.w.Parameter.Hint(), white, p.tracker.Theme.Shaper)
info := p.buildSendTargetTooltip(sends)
color := white
hint := p.w.Parameter.Hint()
if !hint.Valid {
color = paramValueInvalidColor
}
label := Label(hint.Label, color, p.tracker.Theme.Shaper)
if info == "" {
return label(gtx)
}
@ -391,7 +390,7 @@ func (p ParameterStyle) Layout(gtx C) D {
)
}
func unitNameFor(index int, u sointu.Unit) string {
func buildUnitLabel(index int, u sointu.Unit) string {
text := u.Type
if u.Comment != "" {
text = fmt.Sprintf("%s \"%s\"", text, u.Comment)
@ -399,47 +398,11 @@ func unitNameFor(index int, u sointu.Unit) string {
return fmt.Sprintf("%d: %s", index, text)
}
func (p ParameterStyle) findSends() iter.Seq[sointu.Unit] {
return func(yield func(sointu.Unit) bool) {
param, ok := (p.w.Parameter).(tracker.NamedParameter)
if !ok {
return
}
for _, send := range p.sends {
port := send.Parameters["port"]
unitParam := sointu.FindParamForModulationPort(param.Unit().Type, port)
if unitParam.Name != param.Name() {
continue
}
if !yield(send) {
return
}
}
func (p ParameterStyle) tryDerivedParameterInfo() (isSendTarget bool, sendInfo string) {
param, ok := (p.w.Parameter).(tracker.NamedParameter)
if !ok {
return false, ""
}
}
func (p ParameterStyle) buildSendTargetTooltip(sends []sointu.Unit) string {
if len(sends) == 0 {
return ""
}
targetParam := (p.w.Parameter).(tracker.NamedParameter)
targetInstr := p.tracker.Model.InstrumentForUnit(targetParam.Unit().ID)
amounts := ""
for i := 0; i < len(sends); i++ {
sourceInstr := p.tracker.Model.InstrumentForUnit(sends[0].ID)
sourceInfo := ""
if sourceInstr != targetInstr {
sourceInfo = fmt.Sprintf(" from \"%s\"", sourceInstr.Name)
}
if amounts == "" {
amounts = fmt.Sprintf("x %d%s", sends[i].Parameters["amount"], sourceInfo)
} else {
amounts = fmt.Sprintf("%s, x %d%s", amounts, sends[i].Parameters["amount"], sourceInfo)
}
}
count := "1 send"
if len(sends) > 1 {
count = fmt.Sprintf("%d sends")
}
return fmt.Sprintf("%s [%s]", count, amounts)
isSendTarget, sendInfo, _ = p.tracker.ParameterInfo(param.Unit().ID, param.Name())
return isSendTarget, sendInfo
}