joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-03 16:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/draw: rename ImageOp.Img to Src

Browse Source 
To match widget.Image.Src field name.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-18 15:58:11 +02:00
parent 934aa4fe8d
commit 84fb7279eb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/internal/gpu/gpu.go
+1 -1
View File
@@ -699,7 +699,7 @@ loop:
case ops.TypeImage: case ops.TypeImage:
var op gdraw.ImageOp var op gdraw.ImageOp
op.Decode(encOp.Data, encOp.Refs) op.Decode(encOp.Data, encOp.Refs)
state.img = op.Img state.img = op.Src
state.imgRect = op.Rect state.imgRect = op.Rect
case ops.TypeDraw: case ops.TypeDraw:
var op gdraw.DrawOp var op gdraw.DrawOp
ui/draw/draw.go
+3 -3
View File
@@ -14,7 +14,7 @@ import (
) )
type ImageOp struct { type ImageOp struct {
Img image.Image Src image.Image
Rect image.Rectangle 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[5:], uint32(i.Rect.Min.Y))
bo.PutUint32(data[9:], uint32(i.Rect.Max.X)) bo.PutUint32(data[9:], uint32(i.Rect.Max.X))
bo.PutUint32(data[13:], uint32(i.Rect.Max.Y)) 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{}) { func (i *ImageOp) Decode(data []byte, refs []interface{}) {
@@ -53,7 +53,7 @@ func (i *ImageOp) Decode(data []byte, refs []interface{}) {
}, },
} }
*i = ImageOp{ *i = ImageOp{
Img: refs[0].(image.Image), Src: refs[0].(image.Image),
Rect: sr, Rect: sr,
} }
} }
ui/widget/image.go
+1 -1
View File
@@ -45,7 +45,7 @@ func (im Image) Layout(c ui.Config, ops *ui.Ops, cs layout.Constraints) layout.D
dr := f32.Rectangle{ dr := f32.Rectangle{
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)}, 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) draw.DrawOp{Rect: dr}.Add(ops)
return layout.Dimens{Size: d, Baseline: d.Y} return layout.Dimens{Size: d, Baseline: d.Y}
} }