mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-07-21 06:24:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker/gioui): move element etc. functions away from style

Browse Source 
Now the element / fg / bg functions are passed to the actual Layout
function, not first put to the style. This avoids moving of the
element function to heap.
This commit is contained in:
5684185+vsariola@users.noreply.github.com
2025-05-26 22:31:01 +03:00
parent de2e64533d
commit d20a23d57b
6 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tracker/gioui/draglist.go
View File

@ -32,23 +32,20 @@ type DragList struct {
}
type FilledDragListStyle struct {
dragList *DragList
HoverColor color.NRGBA
Cursor CursorStyle
Selection CursorStyle
ScrollBar ScrollBarStyle
element, bg func(gtx C, i int) D
dragList *DragList
HoverColor color.NRGBA
Cursor CursorStyle
Selection CursorStyle
ScrollBar ScrollBarStyle
}
func NewDragList(model tracker.List, axis layout.Axis) *DragList {
return &DragList{TrackerList: model, List: &layout.List{Axis: axis}, HoverItem: -1, ScrollBar: &ScrollBar{Axis: axis}}
}
func FilledDragList(th *Theme, dragList *DragList, element, bg func(gtx C, i int) D) FilledDragListStyle {
func FilledDragList(th *Theme, dragList *DragList) FilledDragListStyle {
return FilledDragListStyle{
dragList: dragList,
element: element,
bg: bg,
HoverColor: hoveredColor(th.Selection.Active),
Cursor: th.Cursor,
Selection: th.Selection,
@ -68,7 +65,7 @@ func (s FilledDragListStyle) LayoutScrollBar(gtx C) D {
return s.dragList.ScrollBar.Layout(gtx, &s.ScrollBar, s.dragList.TrackerList.Count(), &s.dragList.List.Position)
}
func (s FilledDragListStyle) Layout(gtx C) D {
func (s FilledDragListStyle) Layout(gtx C, element, bg func(gtx C, i int) D) D {
swap := 0
defer op.Offset(image.Point{}).Push(gtx.Ops).Pop()
@ -243,11 +240,11 @@ func (s FilledDragListStyle) Layout(gtx C) D {
return layout.Dimensions{Size: gtx.Constraints.Min}
}
macro := op.Record(gtx.Ops)
dims := s.element(gtx, index)
dims := element(gtx, index)
call := macro.Stop()
gtx.Constraints.Min = dims.Size
if s.bg != nil {
s.bg(gtx, index)
if bg != nil {
bg(gtx, index)
}
cursorBg(gtx)
call.Add(gtx.Ops)