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

ui/paint: rename the draw package

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
ui/text/editor.go
+6 -6
View File
@@ -10,12 +10,12 @@ import (
"unicode/utf8"
"gioui.org/ui"
"gioui.org/ui/draw"
"gioui.org/ui/gesture"
"gioui.org/ui/input"
"gioui.org/ui/key"
"gioui.org/ui/layout"
"gioui.org/ui/pointer"
"gioui.org/ui/paint"
"golang.org/x/image/math/fixed"
)
@@ -196,10 +196,10 @@ func (e *Editor) Layout(cfg ui.Config, queue input.Queue, ops *ui.Ops, cs layout
stack.Push(ops)
// Apply material. Set a default color in case the material is empty.
if e.rr.len() > 0 {
draw.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
paint.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
e.Material.Add(ops)
} else {
draw.ColorOp{Color: color.RGBA{A: 0xaa}}.Add(ops)
paint.ColorOp{Color: color.RGBA{A: 0xaa}}.Add(ops)
e.HintMaterial.Add(ops)
}
for {
@@ -211,7 +211,7 @@ func (e *Editor) Layout(cfg ui.Config, queue input.Queue, ops *ui.Ops, cs layout
stack.Push(ops)
ui.TransformOp{}.Offset(lineOff).Add(ops)
e.Face.Path(str).Add(ops)
draw.DrawOp{Rect: toRectF(clip).Sub(lineOff)}.Add(ops)
paint.PaintOp{Rect: toRectF(clip).Sub(lineOff)}.Add(ops)
stack.Pop()
}
if e.focused {
@@ -235,9 +235,9 @@ func (e *Editor) Layout(cfg ui.Config, queue input.Queue, ops *ui.Ops, cs layout
})
carRect = clip.Intersect(carRect)
if !carRect.Empty() {
draw.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
paint.ColorOp{Color: color.RGBA{A: 0xff}}.Add(ops)
e.Material.Add(ops)
draw.DrawOp{Rect: toRectF(carRect)}.Add(ops)
paint.PaintOp{Rect: toRectF(carRect)}.Add(ops)
}
}
if blinking {