mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
Dominik Honnef
51b11486c5
When no scale factor is set, scale by 1.0, mapping one image pixel to one device-independent pixel. This matches the behavior of CSS and other frameworks. The old code attempted to convert to Dp while taking the image's DPI into account. This was wrong in two ways: - It assumed that the default display DPI is 160, but this is only true for Android. Other platforms use 96, 162, or leave it undefined. Thus image.Layout's idea of a dp didn't match that of Gio on most platforms. - It tried to account for image DPI, and assumed a default of 72. This was wrong in that DPI in images is merely metadata meant for printing, not display. The vast majority of software such as image viewers and image editors do not take DPI into account, mapping one image pixel either to one physical pixel or to one device-independent pixel. That is, users would expect their images to either display 1 to 1, or scaled based on PxPerDp, but not scaled based on the image's DPI. We default to a scale of 1 to stay consistent with other parts of Gio that scale by default. Users who don't want any scaling can continue to set the scale to the inverse of PxPerDp. While we're here we clarify the documentation of the Scale field. This change is backwards incompatible for users that relied on the default scale. Signed-off-by: Dominik Honnef <dominik@honnef.co>
55 lines
1.4 KiB
Go
55 lines
1.4 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
|
|
// Fit specifies how to scale the image to the constraints.
|
|
// By default it does not do any scaling.
|
|
Fit Fit
|
|
// Position specifies where to position the image within
|
|
// the constraints.
|
|
Position layout.Direction
|
|
// Scale is the factor used for converting image pixels to dp.
|
|
// If Scale is zero it defaults to 1.
|
|
//
|
|
// To map one image pixel to one output pixel, set Scale to 1.0 / gtx.Metric.PxPerDp.
|
|
Scale float32
|
|
}
|
|
|
|
func (im Image) Layout(gtx layout.Context) layout.Dimensions {
|
|
scale := im.Scale
|
|
if scale == 0 {
|
|
scale = 1
|
|
}
|
|
|
|
size := im.Src.Size()
|
|
wf, hf := float32(size.X), float32(size.Y)
|
|
w, h := gtx.Dp(unit.Dp(wf*scale)), gtx.Dp(unit.Dp(hf*scale))
|
|
|
|
dims, trans := im.Fit.scale(gtx.Constraints, im.Position, layout.Dimensions{Size: image.Pt(w, h)})
|
|
defer clip.Rect{Max: dims.Size}.Push(gtx.Ops).Pop()
|
|
|
|
pixelScale := scale * gtx.Metric.PxPerDp
|
|
trans = trans.Mul(f32.Affine2D{}.Scale(f32.Point{}, f32.Pt(pixelScale, pixelScale)))
|
|
defer op.Affine(trans).Push(gtx.Ops).Pop()
|
|
|
|
im.Src.Add(gtx.Ops)
|
|
paint.PaintOp{}.Add(gtx.Ops)
|
|
|
|
return dims
|
|
}
|