mirror of
https://github.com/vsariola/sointu.git
synced 2025-06-03 00:58:26 -04:00
a38a0f4235
text.Shaper is not thread safe, which caused crash when adding multiple VSTI plugins to a DAW project. This change fixes that crash. Further refactorings need to consider where that text.Shaper should actually reside.
54 lines
1.4 KiB
Go
54 lines
1.4 KiB
Go
package gioui
|
|
|
|
import (
|
|
"image"
|
|
"image/color"
|
|
|
|
"gioui.org/font"
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
)
|
|
|
|
type LabelStyle struct {
|
|
Text string
|
|
Color color.NRGBA
|
|
ShadeColor color.NRGBA
|
|
Alignment layout.Direction
|
|
Font font.Font
|
|
FontSize unit.Sp
|
|
Shaper *text.Shaper
|
|
}
|
|
|
|
func (l LabelStyle) Layout(gtx layout.Context) layout.Dimensions {
|
|
return layout.Stack{Alignment: l.Alignment}.Layout(gtx,
|
|
layout.Stacked(func(gtx layout.Context) layout.Dimensions {
|
|
defer op.Offset(image.Point{}).Push(gtx.Ops).Pop()
|
|
paint.ColorOp{Color: l.ShadeColor}.Add(gtx.Ops)
|
|
op.Offset(image.Pt(2, 2)).Add(gtx.Ops)
|
|
dims := widget.Label{
|
|
Alignment: text.Start,
|
|
MaxLines: 1,
|
|
}.Layout(gtx, l.Shaper, l.Font, l.FontSize, l.Text, op.CallOp{})
|
|
return layout.Dimensions{
|
|
Size: dims.Size.Add(image.Pt(2, 2)),
|
|
Baseline: dims.Baseline,
|
|
}
|
|
}),
|
|
layout.Stacked(func(gtx layout.Context) layout.Dimensions {
|
|
paint.ColorOp{Color: l.Color}.Add(gtx.Ops)
|
|
return widget.Label{
|
|
Alignment: text.Start,
|
|
MaxLines: 1,
|
|
}.Layout(gtx, l.Shaper, l.Font, l.FontSize, l.Text, op.CallOp{})
|
|
}),
|
|
)
|
|
}
|
|
|
|
func Label(str string, color color.NRGBA, shaper *text.Shaper) layout.Widget {
|
|
return LabelStyle{Text: str, Color: color, ShadeColor: black, Font: labelDefaultFont, FontSize: labelDefaultFontSize, Alignment: layout.W, Shaper: shaper}.Layout
|
|
}
|