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

feat(tracker/gioui): clicking a parameter slider (etc.) selects it

Browse Source 
Closes #112.
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2024-09-08 14:46:01 +03:00
parent 6924b63e02
commit e49f699f62
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased ## Unreleased
### Added ### Added
- Clicking the parameter slider also selects that parameter ([#112][i112])
- The vertical and horizontal split bars indicate with a cursor that they can be - The vertical and horizontal split bars indicate with a cursor that they can be
resized ([#145][i145]) resized ([#145][i145])

6
tracker/gioui/unit_editor.go
View File

@ -263,12 +263,12 @@ func (p ParameterStyle) Layout(gtx C) D {
sliderStyle := material.Slider(p.Theme, &p.w.floatWidget) sliderStyle := material.Slider(p.Theme, &p.w.floatWidget)
sliderStyle.Color = p.Theme.Fg sliderStyle.Color = p.Theme.Fg
r := image.Rectangle{Max: gtx.Constraints.Min} r := image.Rectangle{Max: gtx.Constraints.Min}
area := clip.Rect(r).Push(gtx.Ops) defer clip.Rect(r).Push(gtx.Ops).Pop()
defer pointer.PassOp{}.Push(gtx.Ops).Pop()
if p.Focus { if p.Focus {
event.Op(gtx.Ops, &p.w.floatWidget) event.Op(gtx.Ops, &p.w.floatWidget)
} }
dims := sliderStyle.Layout(gtx) dims := sliderStyle.Layout(gtx)
area.Pop()
tracker.Int{IntData: p.w.Parameter}.Set(int(p.w.floatWidget.Value*float32(ra.Max-ra.Min) + float32(ra.Min) + 0.5)) tracker.Int{IntData: p.w.Parameter}.Set(int(p.w.floatWidget.Value*float32(ra.Max-ra.Min) + float32(ra.Min) + 0.5))
return dims return dims
case tracker.BoolParameter: case tracker.BoolParameter:
@ -279,6 +279,7 @@ func (p ParameterStyle) Layout(gtx C) D {
boolStyle := material.Switch(p.Theme, &p.w.boolWidget, "Toggle boolean parameter") boolStyle := material.Switch(p.Theme, &p.w.boolWidget, "Toggle boolean parameter")
boolStyle.Color.Disabled = p.Theme.Fg boolStyle.Color.Disabled = p.Theme.Fg
boolStyle.Color.Enabled = white boolStyle.Color.Enabled = white
defer pointer.PassOp{}.Push(gtx.Ops).Pop()
dims := layout.Center.Layout(gtx, boolStyle.Layout) dims := layout.Center.Layout(gtx, boolStyle.Layout)
if p.w.boolWidget.Value { if p.w.boolWidget.Value {
tracker.Int{IntData: p.w.Parameter}.Set(ra.Max) tracker.Int{IntData: p.w.Parameter}.Set(ra.Max)
@ -320,6 +321,7 @@ func (p ParameterStyle) Layout(gtx C) D {
}) })
} }
} }
defer pointer.PassOp{}.Push(gtx.Ops).Pop()
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx, return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(p.tracker.layoutMenu(gtx, instrName, &p.w.instrBtn, &p.w.instrMenu, unit.Dp(200), layout.Rigid(p.tracker.layoutMenu(gtx, instrName, &p.w.instrBtn, &p.w.instrMenu, unit.Dp(200),
instrItems..., instrItems...,