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

tracker: only one "hex" checkbox in the tracker title bar

Browse Source 
Closes #28
This commit is contained in:
vsariola 2021-02-17 09:35:57 +02:00
parent da6cc0a2b8
commit 12d5d392c5
2 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tracker/track.go
View File

@ -47,10 +47,6 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
t.AddTrack()
}
for len(t.TrackHexCheckBoxes) < len(t.song.Tracks) {
t.TrackHexCheckBoxes = append(t.TrackHexCheckBoxes, new(widget.Bool))
}
for len(t.TrackShowHex) < len(t.song.Tracks) {
t.TrackShowHex = append(t.TrackShowHex, false)
}
@ -120,6 +116,8 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min.X = gtx.Px(unit.Dp(70))
return in.Layout(gtx, numStyle.Layout)
}
t.TrackHexCheckBox.Value = t.TrackShowHex[t.Cursor.Track]
hexCheckBoxStyle := material.CheckBox(t.Theme, t.TrackHexCheckBox, "Hex")
dims := layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(Label("OCT:", white)),
layout.Rigid(octave),
@ -128,10 +126,12 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
layout.Rigid(subtractSemitoneBtnStyle.Layout),
layout.Rigid(addOctaveBtnStyle.Layout),
layout.Rigid(subtractOctaveBtnStyle.Layout),
layout.Rigid(Label("Voices:", white)),
layout.Rigid(hexCheckBoxStyle.Layout),
layout.Rigid(Label(" Voices:", white)),
layout.Rigid(voiceUpDown),
layout.Flexed(1, func(gtx C) D { return layout.Dimensions{Size: gtx.Constraints.Min} }),
layout.Rigid(newTrackBtnStyle.Layout))
t.TrackShowHex[t.Cursor.Track] = t.TrackHexCheckBox.Value
t.SetTrackVoices(t.TrackVoices.Value)
return dims
}
@ -158,33 +158,11 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
layout.Flexed(1, func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
rowMarkers,
layout.Flexed(1, func(gtx C) D {
return layout.Stack{Alignment: layout.NW}.Layout(gtx,
layout.Stacked(t.layoutTracks),
layout.Stacked(t.layoutTrackTitles),
)
}))
layout.Flexed(1, t.layoutTracks))
}),
)
}
func (t *Tracker) layoutTrackTitles(gtx C) D {
defer op.Save(gtx.Ops).Load()
hexFlexChildren := make([]layout.FlexChild, len(t.song.Tracks))
for trkIndex := range t.song.Tracks {
trkIndex2 := trkIndex
hexFlexChildren[trkIndex] = layout.Rigid(func(gtx C) D {
t.TrackHexCheckBoxes[trkIndex2].Value = t.TrackShowHex[trkIndex2]
cbStyle := material.CheckBox(t.Theme, t.TrackHexCheckBoxes[trkIndex2], "hex")
dims := cbStyle.Layout(gtx)
t.TrackShowHex[trkIndex2] = t.TrackHexCheckBoxes[trkIndex2].Value
return layout.Dimensions{Size: image.Pt(trackColWidth, dims.Size.Y)}
})
}
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, hexFlexChildren...)
}
func (t *Tracker) layoutTracks(gtx C) D {
defer op.Save(gtx.Ops).Load()
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops)

3
tracker/tracker.go
View File

@ -71,7 +71,7 @@ type Tracker struct {
AddUnitBtn *widget.Clickable
ParameterLabelBtns []*widget.Clickable
InstrumentDragList *DragList
TrackHexCheckBoxes []*widget.Bool
TrackHexCheckBox *widget.Bool
TrackShowHex []bool
VuMeter VuMeter
TopHorizontalSplit *Split
@ -698,6 +698,7 @@ func New(audioContext sointu.AudioContext, synthService sointu.SynthService) *Tr
ClearUnitBtn: new(widget.Clickable),
PanicBtn: new(widget.Clickable),
CopyInstrumentBtn: new(widget.Clickable),
TrackHexCheckBox: new(widget.Bool),
Menus: make([]Menu, 2),
MenuBar: make([]widget.Clickable, 2),
UnitDragList: &DragList{List: &layout.List{Axis: layout.Vertical}},