mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
ui/draw: rename ImageOp.Img to Src
To match widget.Image.Src field name. Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
@@ -699,7 +699,7 @@ loop:
|
||||
case ops.TypeImage:
|
||||
var op gdraw.ImageOp
|
||||
op.Decode(encOp.Data, encOp.Refs)
|
||||
state.img = op.Img
|
||||
state.img = op.Src
|
||||
state.imgRect = op.Rect
|
||||
case ops.TypeDraw:
|
||||
var op gdraw.DrawOp
|
||||
|
||||
+3
-3
@@ -14,7 +14,7 @@ import (
|
||||
)
|
||||
|
||||
type ImageOp struct {
|
||||
Img image.Image
|
||||
Src image.Image
|
||||
Rect image.Rectangle
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ func (i ImageOp) Add(o *ui.Ops) {
|
||||
bo.PutUint32(data[5:], uint32(i.Rect.Min.Y))
|
||||
bo.PutUint32(data[9:], uint32(i.Rect.Max.X))
|
||||
bo.PutUint32(data[13:], uint32(i.Rect.Max.Y))
|
||||
o.Write(data, i.Img)
|
||||
o.Write(data, i.Src)
|
||||
}
|
||||
|
||||
func (i *ImageOp) Decode(data []byte, refs []interface{}) {
|
||||
@@ -53,7 +53,7 @@ func (i *ImageOp) Decode(data []byte, refs []interface{}) {
|
||||
},
|
||||
}
|
||||
*i = ImageOp{
|
||||
Img: refs[0].(image.Image),
|
||||
Src: refs[0].(image.Image),
|
||||
Rect: sr,
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ func (im Image) Layout(c ui.Config, ops *ui.Ops, cs layout.Constraints) layout.D
|
||||
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.ImageOp{Src: im.Src, Rect: im.Rect}.Add(ops)
|
||||
draw.DrawOp{Rect: dr}.Add(ops)
|
||||
return layout.Dimens{Size: d, Baseline: d.Y}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user