ui/paint: rename the draw package

The draw package name clashes with the standard library draw package.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-08-07 20:11:53 +02:00
parent 6e26c92c75
commit dd35a48a61
10 changed files with 36 additions and 35 deletions
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"unicode/utf8"
"gioui.org/ui"
"gioui.org/ui/draw"
"gioui.org/ui/f32"
"gioui.org/ui/layout"
"gioui.org/ui/paint"
"golang.org/x/image/math/fixed"
)
@@ -113,9 +113,9 @@ func (l Label) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
ui.TransformOp{}.Offset(off).Add(ops)
l.Face.Path(str).Add(ops)
// Set a default color in case the material is empty.
draw.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
paint.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
l.Material.Add(ops)
draw.DrawOp{Rect: lclip}.Add(ops)
paint.PaintOp{Rect: lclip}.Add(ops)
stack.Pop()
}
return dims