joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 23:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/widget: preserve image aspect in Image.Layout

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-09 14:39:08 +02:00
parent f3164c9fce
commit ca24026ffd
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/widget/image.go
+13
View File
@@ -17,6 +17,11 @@ type Image struct {
}
func (im Image) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
size := im.Src.Bounds()
w, h := size.Dx(), size.Dy()
if w == 0 || h == 0 {
return layout.Dimens{}
}
d := image.Point{X: cs.Width.Max, Y: cs.Height.Max}
if d.X == ui.Inf {
d.X = cs.Width.Min
@@ -24,6 +29,14 @@ func (im Image) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
if d.Y == ui.Inf {
d.Y = cs.Height.Min
}
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)},
}