mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 07:35:40 +00:00
Elias Naur
3d37491342
The unit.Value is a struct and thus more inconvenient to use than its
underlying float32 type. In addition, most uses don't need a general
value, but rather a specific unit given by the context. This change
replaces unit.Value with two float32 units, Dp and Sp. It also changes
variables and parameters of unit.Value to a specific unit type matching
the context. That is, unit.Dp everywhere except for text sizes which are
in Sp.
Switching to typed float32s has multiple advantages
- They can be constants:
const touchSlop = unit.Dp(16)
- Casting untyped constants is no longer necessary:
insets := layout.UniformInset(16)
- Calculation with values is natural:
func (s ScrollbarStyle) Width() unit.Dp {
return s.Indicator.MinorWidth + s.Track.MinorPadding + s.Track.MinorPadding
}
The main API change is that calls to gtx.Px must be replaced with either
gtx.Dp or gtx.Sp depending on the unit.
Idea by Christophe Meessen.
Signed-off-by: Elias Naur <mail@eliasnaur.com>
73 lines
1.6 KiB
Go
73 lines
1.6 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package widget
|
|
|
|
import (
|
|
"image"
|
|
"image/color"
|
|
"image/draw"
|
|
|
|
"gioui.org/internal/f32color"
|
|
"gioui.org/layout"
|
|
"gioui.org/op/clip"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/unit"
|
|
|
|
"golang.org/x/exp/shiny/iconvg"
|
|
)
|
|
|
|
type Icon struct {
|
|
src []byte
|
|
// Cached values.
|
|
op paint.ImageOp
|
|
imgSize int
|
|
imgColor color.NRGBA
|
|
}
|
|
|
|
const defaultIconSize = unit.Dp(24)
|
|
|
|
// NewIcon returns a new Icon from IconVG data.
|
|
func NewIcon(data []byte) (*Icon, error) {
|
|
_, err := iconvg.DecodeMetadata(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &Icon{src: data}, nil
|
|
}
|
|
|
|
// Layout displays the icon with its size set to the X minimum constraint.
|
|
func (ic *Icon) Layout(gtx layout.Context, color color.NRGBA) layout.Dimensions {
|
|
sz := gtx.Constraints.Min.X
|
|
if sz == 0 {
|
|
sz = gtx.Dp(defaultIconSize)
|
|
}
|
|
size := gtx.Constraints.Constrain(image.Pt(sz, sz))
|
|
defer clip.Rect{Max: size}.Push(gtx.Ops).Pop()
|
|
|
|
ico := ic.image(size.X, color)
|
|
ico.Add(gtx.Ops)
|
|
paint.PaintOp{}.Add(gtx.Ops)
|
|
return layout.Dimensions{
|
|
Size: ico.Size(),
|
|
}
|
|
}
|
|
|
|
func (ic *Icon) image(sz int, color color.NRGBA) paint.ImageOp {
|
|
if sz == ic.imgSize && color == ic.imgColor {
|
|
return ic.op
|
|
}
|
|
m, _ := iconvg.DecodeMetadata(ic.src)
|
|
dx, dy := m.ViewBox.AspectRatio()
|
|
img := image.NewRGBA(image.Rectangle{Max: image.Point{X: sz, Y: int(float32(sz) * dy / dx)}})
|
|
var ico iconvg.Rasterizer
|
|
ico.SetDstImage(img, img.Bounds(), draw.Src)
|
|
m.Palette[0] = f32color.NRGBAToLinearRGBA(color)
|
|
iconvg.Decode(&ico, ic.src, &iconvg.DecodeOptions{
|
|
Palette: &m.Palette,
|
|
})
|
|
ic.op = paint.NewImageOp(img)
|
|
ic.imgSize = sz
|
|
ic.imgColor = color
|
|
return ic.op
|
|
}
|