mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
Chris Waldon
6faed7e724
Commit 94d242d broke the widget.Image's Scale field so
that it no longer had any effect on the actual size of
the displayed image. This commit fixes that, as well as
adding tests to confirm that the widget.Image type
scales appropriately with DPI changes and its own Scale
field.
Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
47 lines
1.1 KiB
Go
47 lines
1.1 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package widget
|
|
|
|
import (
|
|
"image"
|
|
|
|
"gioui.org/f32"
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/op/clip"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/unit"
|
|
)
|
|
|
|
// Image is a widget that displays an image.
|
|
type Image struct {
|
|
// Src is the image to display.
|
|
Src paint.ImageOp
|
|
// Scale is the ratio of image pixels to
|
|
// dps. If Scale is zero Image falls back to
|
|
// a scale that match a standard 72 DPI.
|
|
Scale float32
|
|
}
|
|
|
|
const defaultScale = float32(160.0 / 72.0)
|
|
|
|
func (im Image) Layout(gtx layout.Context) layout.Dimensions {
|
|
scale := im.Scale
|
|
if scale == 0 {
|
|
scale = defaultScale
|
|
}
|
|
size := im.Src.Size()
|
|
wf, hf := float32(size.X), float32(size.Y)
|
|
w, h := gtx.Px(unit.Dp(wf*scale)), gtx.Px(unit.Dp(hf*scale))
|
|
cs := gtx.Constraints
|
|
d := cs.Constrain(image.Pt(w, h))
|
|
stack := op.Save(gtx.Ops)
|
|
pixelScale := scale * gtx.Metric.PxPerDp
|
|
op.Affine(f32.Affine2D{}.Scale(f32.Point{}, f32.Pt(pixelScale, pixelScale))).Add(gtx.Ops)
|
|
clip.Rect(image.Rectangle{Max: d}).Add(gtx.Ops)
|
|
im.Src.Add(gtx.Ops)
|
|
paint.PaintOp{}.Add(gtx.Ops)
|
|
stack.Load()
|
|
return layout.Dimensions{Size: d}
|
|
}
|