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): add surface color to instrument editor

Browse Source
This commit is contained in:
vsariola 2021-01-10 15:24:20 +02:00
parent fa893c94f1
commit 37185c98b3
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tracker/instruments.go
View File

@ -5,6 +5,9 @@ import (
"sort" "sort"
"gioui.org/layout" "gioui.org/layout"
"gioui.org/op/clip"
"gioui.org/op/paint"
"gioui.org/unit"
"gioui.org/widget" "gioui.org/widget"
"gioui.org/widget/material" "gioui.org/widget/material"
) )
@ -43,13 +46,21 @@ func (t *Tracker) layoutInstrumentNames() layout.Widget {
t.CurrentInstrument = index t.CurrentInstrument = index
} }
btnStyle := material.Button(t.Theme, t.InstrumentBtns[index], fmt.Sprintf("%v", index)) btnStyle := material.Button(t.Theme, t.InstrumentBtns[index], fmt.Sprintf("%v", index))
btnStyle.Background = transparent btnStyle.CornerRadius = unit.Dp(0)
if t.CurrentInstrument == index {
btnStyle.Background = instrumentSurfaceColor
} else {
btnStyle.Background = transparent
}
return btnStyle.Layout(gtx) return btnStyle.Layout(gtx)
}) })
} }
} }
func (t *Tracker) layoutInstrumentEditor() layout.Widget { func (t *Tracker) layoutInstrumentEditor() layout.Widget {
return func(gtx C) D { return func(gtx C) D {
paint.FillShape(gtx.Ops, instrumentSurfaceColor, clip.Rect{
Max: gtx.Constraints.Max,
}.Op())
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(t.layoutUnitList()), layout.Rigid(t.layoutUnitList()),
layout.Rigid(t.layoutUnitControls())) layout.Rigid(t.layoutUnitControls()))

4
tracker/layout.go
View File

@ -149,8 +149,8 @@ func (t *Tracker) layoutTracker(gtx layout.Context) layout.Dimensions {
} }
func (t *Tracker) layoutControls(gtx layout.Context) layout.Dimensions { func (t *Tracker) layoutControls(gtx layout.Context) layout.Dimensions {
gtx.Constraints.Min.Y = 200 gtx.Constraints.Min.Y = 250
gtx.Constraints.Max.Y = 200 gtx.Constraints.Max.Y = 250
playPat := t.PlayPattern playPat := t.PlayPattern
if !t.Playing { if !t.Playing {

2
tracker/theme.go
View File

@ -79,3 +79,5 @@ var patternFont = fontCollection[6].Font
var patternFontSize = unit.Px(12) var patternFontSize = unit.Px(12)
var inactiveBtnColor = color.RGBA{R: 61, G: 55, B: 55, A: 255} var inactiveBtnColor = color.RGBA{R: 61, G: 55, B: 55, A: 255}
var instrumentSurfaceColor = color.RGBA{R: 31, G: 31, B: 31, A: 31}