mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-07-18 04:54:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker): change so that all icon initialization is a lazy & cache in iconcache

Browse Source
This commit is contained in:
vsariola
2021-02-01 17:57:13 +02:00
parent c667ffb4e1
commit 3cf2fc70a8
4 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tracker/layout.go
View File

@ -3,7 +3,6 @@ package tracker
import (
"image"
"image/color"
"log"
"gioui.org/layout"
"gioui.org/op"
@ -12,50 +11,9 @@ import (
"gioui.org/unit"
"gioui.org/widget"
"gioui.org/widget/material"
"golang.org/x/exp/shiny/materialdesign/icons"
)
var upIcon *widget.Icon
var downIcon *widget.Icon
var addIcon *widget.Icon
var loadIcon *widget.Icon
var saveIcon *widget.Icon
var clearIcon *widget.Icon
var deleteIcon *widget.Icon
func init() {
var err error
upIcon, err = widget.NewIcon(icons.NavigationArrowUpward)
if err != nil {
log.Fatal(err)
}
downIcon, err = widget.NewIcon(icons.NavigationArrowDownward)
if err != nil {
log.Fatal(err)
}
addIcon, err = widget.NewIcon(icons.ContentAdd)
if err != nil {
log.Fatal(err)
}
loadIcon, err = widget.NewIcon(icons.FileFolder)
if err != nil {
log.Fatal(err)
}
saveIcon, err = widget.NewIcon(icons.ContentSave)
if err != nil {
log.Fatal(err)
}
clearIcon, err = widget.NewIcon(icons.ContentClear)
if err != nil {
log.Fatal(err)
}
deleteIcon, err = widget.NewIcon(icons.ActionDelete)
if err != nil {
log.Fatal(err)
}
}
func smallButton(icStyle material.IconButtonStyle) material.IconButtonStyle {
icStyle.Size = unit.Dp(14)
icStyle.Inset = layout.UniformInset(unit.Dp(1))
@ -178,7 +136,7 @@ func (t *Tracker) layoutTracks(gtx layout.Context) layout.Dimensions {
subtractOctaveBtnStyle.Color = primaryColor
subtractOctaveBtnStyle.Background = transparent
subtractOctaveBtnStyle.Inset = layout.UniformInset(unit.Dp(6))
newTrackBtnStyle := material.IconButton(t.Theme, t.NewTrackBtn, addIcon)
newTrackBtnStyle := material.IconButton(t.Theme, t.NewTrackBtn, widgetForIcon(icons.ContentAdd))
newTrackBtnStyle.Background = transparent
newTrackBtnStyle.Inset = layout.UniformInset(unit.Dp(6))
if t.song.TotalTrackVoices() < t.song.Patch.TotalVoices() {