diff --git a/ui/app/internal/gpu/gpu.go b/ui/app/internal/gpu/gpu.go index 15c33054..622f09ed 100644 --- a/ui/app/internal/gpu/gpu.go +++ b/ui/app/internal/gpu/gpu.go @@ -699,7 +699,7 @@ loop: var op gdraw.ColorOp op.Decode(encOp.Data, encOp.Refs) state.img = nil - state.color = op.Col + state.color = op.Color case ops.TypeImage: var op gdraw.ImageOp op.Decode(encOp.Data, encOp.Refs) diff --git a/ui/draw/draw.go b/ui/draw/draw.go index ca12ff38..f3215fc6 100644 --- a/ui/draw/draw.go +++ b/ui/draw/draw.go @@ -19,7 +19,7 @@ type ImageOp struct { } type ColorOp struct { - Col color.RGBA + Color color.RGBA } type DrawOp struct { @@ -61,10 +61,10 @@ func (i *ImageOp) Decode(data []byte, refs []interface{}) { func (c ColorOp) Add(o *ui.Ops) { data := make([]byte, ops.TypeColorLen) data[0] = byte(ops.TypeColor) - data[1] = c.Col.R - data[2] = c.Col.G - data[3] = c.Col.B - data[4] = c.Col.A + data[1] = c.Color.R + data[2] = c.Color.G + data[3] = c.Color.B + data[4] = c.Color.A o.Write(data) } @@ -73,7 +73,7 @@ func (c *ColorOp) Decode(data []byte, refs []interface{}) { panic("invalid op") } *c = ColorOp{ - Col: color.RGBA{ + Color: color.RGBA{ R: data[1], G: data[2], B: data[3], diff --git a/ui/text/editor.go b/ui/text/editor.go index d4365d4f..7fa4b6f7 100644 --- a/ui/text/editor.go +++ b/ui/text/editor.go @@ -206,10 +206,10 @@ func (e *Editor) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { ui.PushOp{}.Add(ops) // Apply material. Set a default color in case the material is empty. if e.rr.len() > 0 { - draw.ColorOp{Col: color.RGBA{A: 0xff}}.Add(ops) + draw.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops) e.Material.Add(ops) } else { - draw.ColorOp{Col: color.RGBA{A: 0xaa}}.Add(ops) + draw.ColorOp{Color: color.RGBA{A: 0xaa}}.Add(ops) e.HintMaterial.Add(ops) } for { diff --git a/ui/text/label.go b/ui/text/label.go index 32e3342a..3c847578 100644 --- a/ui/text/label.go +++ b/ui/text/label.go @@ -111,7 +111,7 @@ func (l Label) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { ui.TransformOp{Transform: ui.Offset(off)}.Add(ops) l.Face.Path(str).Add(ops) // Set a default color in case the material is empty. - draw.ColorOp{Col: color.RGBA{A: 0xff}}.Add(ops) + draw.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops) l.Material.Add(ops) draw.DrawOp{Rect: lclip}.Add(ops) ui.PopOp{}.Add(ops)