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

app/headless,internal/rendertest: replace PaintOps with Fill/FillShape

Browse Source 
We're about to remove PaintOp.Rect. Replacing PaintOps with Fill or
FillShape where possible will ease the transition.

Using Fill in tests exposed a problem with the infinity in paint.Fill.
Adjust it for now; it will be removed later.

Updates gio#167

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-11-05 16:06:27 +01:00
parent 852958f4b5
commit afb52194d1
6 changed files with 36 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/headless/headless_test.go
+3 -12
View File
@@ -22,10 +22,7 @@ func TestHeadless(t *testing.T) {
var ops op.Ops
paint.ColorOp{Color: col}.Add(&ops)
// Paint only part of the screen to avoid the glClear optimization.
paint.PaintOp{Rect: f32.Rectangle{Max: f32.Point{
X: float32(sz.X) - 100,
Y: float32(sz.Y) - 100,
}}}.Add(&ops)
paint.FillShape(&ops, col, clip.Rect(image.Rect(0, 0, sz.X-100, sz.Y-100)).Op())
if err := w.Frame(&ops); err != nil {
t.Fatal(err)
}
@@ -108,15 +105,9 @@ func TestDepth(t *testing.T) {
var ops op.Ops
blue := color.RGBA{B: 0xFF, A: 0xFF}
paint.ColorOp{Color: blue}.Add(&ops)
paint.PaintOp{Rect: f32.Rectangle{
Max: f32.Point{X: 50, Y: 100},
}}.Add(&ops)
paint.FillShape(&ops, blue, clip.Rect(image.Rect(0, 0, 50, 100)).Op())
red := color.RGBA{R: 0xFF, A: 0xFF}
paint.ColorOp{Color: red}.Add(&ops)
paint.PaintOp{Rect: f32.Rectangle{
Max: f32.Point{X: 100, Y: 50},
}}.Add(&ops)
paint.FillShape(&ops, red, clip.Rect(image.Rect(0, 0, 100, 50)).Op())
if err := w.Frame(&ops); err != nil {
t.Fatal(err)
}