mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-07-20 22:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker/gioui): remove unnecessary caching of Strings

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com
2025-06-24 11:07:42 +03:00
parent f6bc5fffcd
commit b79de95f91
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tracker/gioui/instrument_editor.go
View File

@ -37,9 +37,7 @@ type (
soloBtn *Clickable soloBtn *Clickable
muteBtn *Clickable muteBtn *Clickable
commentEditor *Editor commentEditor *Editor
commentString tracker.String
nameEditor *Editor nameEditor *Editor
nameString tracker.String
searchEditor *Editor searchEditor *Editor
instrumentDragList *DragList instrumentDragList *DragList
unitDragList *DragList unitDragList *DragList
@ -84,8 +82,6 @@ func NewInstrumentEditor(model *tracker.Model) *InstrumentEditor {
commentEditor: NewEditor(false, false, text.Start), commentEditor: NewEditor(false, false, text.Start),
nameEditor: NewEditor(true, true, text.Middle), nameEditor: NewEditor(true, true, text.Middle),
searchEditor: NewEditor(true, true, text.Start), searchEditor: NewEditor(true, true, text.Start),
commentString: model.InstrumentComment(),
nameString: model.InstrumentName(),
instrumentDragList: NewDragList(model.Instruments().List(), layout.Horizontal), instrumentDragList: NewDragList(model.Instruments().List(), layout.Horizontal),
unitDragList: NewDragList(model.Units().List(), layout.Vertical), unitDragList: NewDragList(model.Units().List(), layout.Vertical),
unitEditor: NewUnitEditor(model), unitEditor: NewUnitEditor(model),
@ -260,11 +256,11 @@ func (ie *InstrumentEditor) layoutInstrumentHeader(gtx C, t *Tracker) D {
layout.Rigid(header), layout.Rigid(header),
layout.Rigid(func(gtx C) D { layout.Rigid(func(gtx C) D {
defer clip.Rect(image.Rect(0, 0, gtx.Constraints.Max.X, gtx.Constraints.Max.Y)).Push(gtx.Ops).Pop() defer clip.Rect(image.Rect(0, 0, gtx.Constraints.Max.X, gtx.Constraints.Max.Y)).Push(gtx.Ops).Pop()
for ie.commentEditor.Update(gtx, ie.commentString) != EditorEventNone { for ie.commentEditor.Update(gtx, t.InstrumentComment()) != EditorEventNone {
ie.instrumentDragList.Focus() ie.instrumentDragList.Focus()
} }
ret := layout.UniformInset(unit.Dp(6)).Layout(gtx, func(gtx C) D { ret := layout.UniformInset(unit.Dp(6)).Layout(gtx, func(gtx C) D {
return ie.commentEditor.Layout(gtx, ie.commentString, t.Theme, &t.Theme.InstrumentEditor.InstrumentComment, "Comment") return ie.commentEditor.Layout(gtx, t.InstrumentComment(), t.Theme, &t.Theme.InstrumentEditor.InstrumentComment, "Comment")
}) })
return ret return ret
}), }),
@ -295,12 +291,12 @@ func (ie *InstrumentEditor) layoutInstrumentList(gtx C, t *Tracker) D {
s.Color = color.NRGBA{R: 255, G: k, B: 255, A: 255} s.Color = color.NRGBA{R: 255, G: k, B: 255, A: 255}
} }
if i == ie.instrumentDragList.TrackerList.Selected() { if i == ie.instrumentDragList.TrackerList.Selected() {
for ie.nameEditor.Update(gtx, ie.nameString) != EditorEventNone { for ie.nameEditor.Update(gtx, t.InstrumentName()) != EditorEventNone {
ie.instrumentDragList.Focus() ie.instrumentDragList.Focus()
} }
return layout.Center.Layout(gtx, func(gtx C) D { return layout.Center.Layout(gtx, func(gtx C) D {
defer clip.Rect(image.Rect(0, 0, gtx.Constraints.Max.X, gtx.Constraints.Max.Y)).Push(gtx.Ops).Pop() defer clip.Rect(image.Rect(0, 0, gtx.Constraints.Max.X, gtx.Constraints.Max.Y)).Push(gtx.Ops).Pop()
return ie.nameEditor.Layout(gtx, ie.nameString, t.Theme, &s, "Instr") return ie.nameEditor.Layout(gtx, t.InstrumentName(), t.Theme, &s, "Instr")
}) })
} }
if name == "" { if name == "" {