mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
Elias Naur
b07d34354e
Before this change, package font implemented a global font registry, with the usual problems of package global state. This change deletes the global registry and introduces the text.Collection type for representing a list of fonts and their faces. Collection exports Lookup that finds the closest match and its face. The existing FontRegistry is renamed to Cache to reflect its new limited functionality: a cache of shapes and measurements on top of a Collection. Then, material.NewTheme is changed to take a Collection and initialize a Cache. Updates gio#19 because multiple windows require a separate (writable) Cache per window, while (read-only) Collections may be shared. Signed-off-by: Elias Naur <mail@eliasnaur.com>
75 lines
1.7 KiB
Go
75 lines
1.7 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image/color"
|
|
|
|
"gioui.org/f32"
|
|
"gioui.org/layout"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
"golang.org/x/exp/shiny/materialdesign/icons"
|
|
)
|
|
|
|
type Theme struct {
|
|
Shaper text.Shaper
|
|
Color struct {
|
|
Primary color.RGBA
|
|
Text color.RGBA
|
|
Hint color.RGBA
|
|
InvText color.RGBA
|
|
}
|
|
TextSize unit.Value
|
|
checkBoxCheckedIcon *widget.Icon
|
|
checkBoxUncheckedIcon *widget.Icon
|
|
radioCheckedIcon *widget.Icon
|
|
radioUncheckedIcon *widget.Icon
|
|
}
|
|
|
|
func NewTheme(col *text.Collection) *Theme {
|
|
t := &Theme{
|
|
Shaper: text.NewCache(col),
|
|
}
|
|
t.Color.Primary = rgb(0x3f51b5)
|
|
t.Color.Text = rgb(0x000000)
|
|
t.Color.Hint = rgb(0xbbbbbb)
|
|
t.Color.InvText = rgb(0xffffff)
|
|
t.TextSize = unit.Sp(16)
|
|
|
|
t.checkBoxCheckedIcon = mustIcon(widget.NewIcon(icons.ToggleCheckBox))
|
|
t.checkBoxUncheckedIcon = mustIcon(widget.NewIcon(icons.ToggleCheckBoxOutlineBlank))
|
|
t.radioCheckedIcon = mustIcon(widget.NewIcon(icons.ToggleRadioButtonChecked))
|
|
t.radioUncheckedIcon = mustIcon(widget.NewIcon(icons.ToggleRadioButtonUnchecked))
|
|
|
|
return t
|
|
}
|
|
|
|
func mustIcon(ic *widget.Icon, err error) *widget.Icon {
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return ic
|
|
}
|
|
|
|
func rgb(c uint32) color.RGBA {
|
|
return argb(0xff000000 | c)
|
|
}
|
|
|
|
func argb(c uint32) color.RGBA {
|
|
return color.RGBA{A: uint8(c >> 24), R: uint8(c >> 16), G: uint8(c >> 8), B: uint8(c)}
|
|
}
|
|
|
|
func fill(gtx layout.Context, col color.RGBA) layout.Dimensions {
|
|
cs := gtx.Constraints
|
|
d := cs.Min
|
|
dr := f32.Rectangle{
|
|
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)},
|
|
}
|
|
paint.ColorOp{Color: col}.Add(gtx.Ops)
|
|
paint.PaintOp{Rect: dr}.Add(gtx.Ops)
|
|
return layout.Dimensions{Size: d}
|
|
}
|