mirror of
https://github.com/vsariola/sointu.git
synced 2025-11-12 21:02:52 -05:00
drafting
This commit is contained in:
parent
e23b3f38c4
commit
09c93420e4
@ -14,6 +14,7 @@ import (
|
||||
|
||||
type (
|
||||
InstrumentProperties struct {
|
||||
nameEditor *Editor
|
||||
commentEditor *Editor
|
||||
list *layout.List
|
||||
soloBtn *Clickable
|
||||
@ -31,25 +32,23 @@ type (
|
||||
func NewInstrumentProperties() *InstrumentProperties {
|
||||
ret := &InstrumentProperties{
|
||||
list: &layout.List{Axis: layout.Vertical},
|
||||
nameEditor: NewEditor(true, true, text.Start),
|
||||
commentEditor: NewEditor(false, false, text.Start),
|
||||
soloBtn: new(Clickable),
|
||||
muteBtn: new(Clickable),
|
||||
voices: NewNumericUpDownState(),
|
||||
splitInstrumentBtn: new(Clickable),
|
||||
}
|
||||
ret.soloHint = makeHint("Solo", " (%s)", "SoloInstrument")
|
||||
ret.unsoloHint = makeHint("Unsolo", " (%s)", "SoloInstrument")
|
||||
ret.muteHint = makeHint("Mute", " (%s)", "MuteInstrument")
|
||||
ret.unmuteHint = makeHint("Unmute", " (%s)", "MuteInstrument")
|
||||
ret.soloHint = makeHint("Solo", " (%s)", "SoloToggle")
|
||||
ret.unsoloHint = makeHint("Unsolo", " (%s)", "SoloToggle")
|
||||
ret.muteHint = makeHint("Mute", " (%s)", "MuteToggle")
|
||||
ret.unmuteHint = makeHint("Unmute", " (%s)", "MuteToggle")
|
||||
ret.splitInstrumentHint = makeHint("Split instrument", " (%s)", "SplitInstrument")
|
||||
return ret
|
||||
}
|
||||
|
||||
// update
|
||||
func (ip *InstrumentProperties) update(gtx C, tr *Tracker) {
|
||||
/*for ip.commentEditor.Update(gtx, tr.InstrumentComment()) != EditorEventNone {
|
||||
tr.PatchPanel.instrList.instrumentDragList.Focus()
|
||||
}*/
|
||||
func (ip *InstrumentProperties) Tags(level int, yield TagYieldFunc) bool {
|
||||
return yield(level, &ip.commentEditor.widgetEditor)
|
||||
}
|
||||
|
||||
// layout
|
||||
@ -66,17 +65,22 @@ func (ip *InstrumentProperties) layout(gtx C) D {
|
||||
layout.Rigid(splitInstrumentBtn.Layout),
|
||||
)
|
||||
}
|
||||
return ip.list.Layout(gtx, 7, func(gtx C, index int) D {
|
||||
|
||||
return ip.list.Layout(gtx, 9, func(gtx C, index int) D {
|
||||
switch index {
|
||||
case 0:
|
||||
return layoutInstrumentPropertyLine(gtx, "Voices", voiceLine)
|
||||
return layoutInstrumentPropertyLine(gtx, "Name", func(gtx C) D {
|
||||
return ip.nameEditor.Layout(gtx, tr.InstrumentName(), tr.Theme, &tr.Theme.InstrumentEditor.InstrumentComment, "Instr")
|
||||
})
|
||||
case 2:
|
||||
return layoutInstrumentPropertyLine(gtx, "Voices", voiceLine)
|
||||
case 4:
|
||||
muteBtn := ToggleIconBtn(tr.Mute(), tr.Theme, ip.muteBtn, icons.ToggleCheckBoxOutlineBlank, icons.ToggleCheckBox, ip.muteHint, ip.unmuteHint)
|
||||
return layoutInstrumentPropertyLine(gtx, "Mute", muteBtn.Layout)
|
||||
case 4:
|
||||
case 6:
|
||||
soloBtn := ToggleIconBtn(tr.Solo(), tr.Theme, ip.soloBtn, icons.ToggleCheckBoxOutlineBlank, icons.ToggleCheckBox, ip.soloHint, ip.unsoloHint)
|
||||
return layoutInstrumentPropertyLine(gtx, "Solo", soloBtn.Layout)
|
||||
case 6:
|
||||
case 8:
|
||||
return layout.UniformInset(unit.Dp(6)).Layout(gtx, func(gtx C) D {
|
||||
return ip.commentEditor.Layout(gtx, tr.InstrumentComment(), tr.Theme, &tr.Theme.InstrumentEditor.InstrumentComment, "Comment")
|
||||
})
|
||||
@ -93,7 +97,7 @@ func layoutInstrumentPropertyLine(gtx C, text string, content layout.Widget) D {
|
||||
gtx.Constraints.Max.X = min(gtx.Dp(unit.Dp(200)), gtx.Constraints.Max.X)
|
||||
label := Label(tr.Theme, &tr.Theme.InstrumentEditor.Properties.Label, text)
|
||||
return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}.Layout(gtx,
|
||||
layout.Rigid(layout.Spacer{Width: 6}.Layout),
|
||||
layout.Rigid(layout.Spacer{Width: 6, Height: 36}.Layout),
|
||||
layout.Rigid(label.Layout),
|
||||
layout.Flexed(1, func(gtx C) D { return layout.Dimensions{Size: gtx.Constraints.Min} }),
|
||||
layout.Rigid(content),
|
||||
|
||||
Reference in New Issue
Block a user