mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
ad4215a7eb
The dp and sp units are approximate and mostly used for layout dimensions that operate in whole pixels. This change alters the Config methods to return pixels in ints instead of floats, which results in smoother use for layout and emphasize the inexactness of the device independent units. Clients can still access to raw PxPrDp and PxPrSp factors from Config. Signed-off-by: Elias Naur <mail@eliasnaur.com>
52 lines
1.2 KiB
Go
52 lines
1.2 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package widget
|
|
|
|
import (
|
|
"image"
|
|
|
|
"gioui.org/ui"
|
|
"gioui.org/ui/draw"
|
|
"gioui.org/ui/f32"
|
|
"gioui.org/ui/layout"
|
|
)
|
|
|
|
type Image struct {
|
|
// Src is the image to display.
|
|
Src image.Image
|
|
// Rect is the source rectangle.
|
|
Rect image.Rectangle
|
|
// Scale is the ratio of image pixels to
|
|
// device pixels. If zero, a scale that
|
|
// makes the image appear at approximately
|
|
// 72 DPI is used.
|
|
Scale float32
|
|
}
|
|
|
|
func (im Image) Layout(c *ui.Config, ops *ui.Ops, cs layout.Constraints) layout.Dimens {
|
|
size := im.Src.Bounds()
|
|
wf, hf := float32(size.Dx()), float32(size.Dy())
|
|
var w, h int
|
|
if im.Scale == 0 {
|
|
const dpPrPx = 160 / 72
|
|
w, h = c.Dp(wf*dpPrPx), c.Dp(hf*dpPrPx)
|
|
} else {
|
|
w, h = int(wf*im.Scale+.5), int(hf*im.Scale+.5)
|
|
}
|
|
d := image.Point{X: cs.Width.Constrain(w), Y: cs.Height.Constrain(h)}
|
|
aspect := float32(w) / float32(h)
|
|
dw, dh := float32(d.X), float32(d.Y)
|
|
dAspect := dw / dh
|
|
if aspect < dAspect {
|
|
d.X = int(dh*aspect + 0.5)
|
|
} else {
|
|
d.Y = int(dw/aspect + 0.5)
|
|
}
|
|
dr := f32.Rectangle{
|
|
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)},
|
|
}
|
|
draw.ImageOp{Img: im.Src, Rect: im.Rect}.Add(ops)
|
|
draw.DrawOp{Rect: dr}.Add(ops)
|
|
return layout.Dimens{Size: d, Baseline: d.Y}
|
|
}
|