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): move track editor controls to top of the track editors

Browse Source
This commit is contained in:
vsariola 2021-01-16 14:45:05 +02:00
parent 80d87dea8c
commit 8f9bf75613
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
tracker/layout.go
View File

@ -154,46 +154,59 @@ func (t *Tracker) layoutTracks(gtx layout.Context) layout.Dimensions {
return ret return ret
}) })
} }
in2 := layout.UniformInset(unit.Dp(8)) menuBg := func(gtx C) D {
menu := layout.Rigid(func(gtx layout.Context) layout.Dimensions { paint.FillShape(gtx.Ops, trackMenuSurfaceColor, clip.Rect{
newTrack := layout.Rigid(func(gtx layout.Context) layout.Dimensions { Max: gtx.Constraints.Min,
paint.FillShape(gtx.Ops, trackMenuSurfaceColor, clip.Rect{ }.Op())
Max: gtx.Constraints.Max, return layout.Dimensions{Size: gtx.Constraints.Min}
}.Op()) }
return in2.Layout(gtx, enableButton(material.IconButton(t.Theme, t.NewTrackBtn, addIcon), t.song.TotalTrackVoices() < t.song.Patch.TotalVoices()).Layout) menu := func(gtx C) D {
}) newTrackBtnStyle := material.IconButton(t.Theme, t.NewTrackBtn, addIcon)
octLabel := layout.Rigid(Label("OCT:", white)) newTrackBtnStyle.Background = transparent
newTrackBtnStyle.Inset = layout.UniformInset(unit.Dp(6))
if t.song.TotalTrackVoices() < t.song.Patch.TotalVoices() {
newTrackBtnStyle.Color = primaryColor
} else {
newTrackBtnStyle.Color = disabledTextColor
}
in := layout.UniformInset(unit.Dp(1)) in := layout.UniformInset(unit.Dp(1))
octRow := layout.Rigid(func(gtx layout.Context) layout.Dimensions { octave := func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout( numStyle := NumericUpDown(t.Theme, t.Octave, 0, 9)
gtx, gtx.Constraints.Min.Y = gtx.Px(unit.Dp(20))
layout.Rigid(func(gtx layout.Context) layout.Dimensions { gtx.Constraints.Min.X = gtx.Px(unit.Dp(70))
numStyle := NumericUpDown(t.Theme, t.Octave, 0, 9) return in.Layout(gtx, numStyle.Layout)
gtx.Constraints.Min.Y = gtx.Px(unit.Dp(20)) }
gtx.Constraints.Min.X = gtx.Px(unit.Dp(70)) return layout.Flex{Axis: layout.Horizontal, Alignment: layout.Middle}.Layout(gtx,
return in.Layout(gtx, numStyle.Layout) layout.Rigid(Label("OCT:", white)),
}), layout.Rigid(octave),
) layout.Flexed(1, func(gtx C) D { return layout.Dimensions{Size: gtx.Constraints.Min} }),
}) layout.Rigid(newTrackBtnStyle.Layout))
return layout.Flex{Axis: layout.Vertical}.Layout(gtx, newTrack, octLabel, octRow) }
})
go func() { go func() {
for t.NewTrackBtn.Clicked() { for t.NewTrackBtn.Clicked() {
t.AddTrack() t.AddTrack()
} }
}() }()
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, return layout.Flex{Axis: layout.Vertical}.Layout(gtx,
rowMarkers, layout.Rigid(func(gtx C) D {
layout.Flexed(1, func(gtx layout.Context) layout.Dimensions { return layout.Stack{Alignment: layout.Center}.Layout(gtx,
defer op.Push(gtx.Ops).Pop() layout.Expanded(menuBg),
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops) layout.Stacked(menu),
dims := layout.Flex{Axis: layout.Horizontal}.Layout(gtx, flexTracks...) )
if dims.Size.X > gtx.Constraints.Max.X { }),
dims.Size.X = gtx.Constraints.Max.X layout.Flexed(1, func(gtx C) D {
} return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
return dims rowMarkers,
layout.Flexed(1, func(gtx layout.Context) layout.Dimensions {
defer op.Push(gtx.Ops).Pop()
clip.Rect{Max: gtx.Constraints.Max}.Add(gtx.Ops)
dims := layout.Flex{Axis: layout.Horizontal}.Layout(gtx, flexTracks...)
if dims.Size.X > gtx.Constraints.Max.X {
dims.Size.X = gtx.Constraints.Max.X
}
return dims
}))
}), }),
menu,
) )
} }