From b7ba80951798496f25abec01eee99356a003e61d Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 14 May 2020 13:18:21 +0200 Subject: [PATCH] op/paint: rename material to brush The "material" name clashes with the theme of the same name. Signed-off-by: Elias Naur --- op/paint/doc.go | 4 ++-- op/paint/paint.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op/paint/doc.go b/op/paint/doc.go index 5ace0c0a..b7b569ab 100644 --- a/op/paint/doc.go +++ b/op/paint/doc.go @@ -3,10 +3,10 @@ /* Package paint provides drawing operations for 2D graphics. -The PaintOp operation draws the current material into a rectangular +The PaintOp operation draws the current brush into a rectangular area, taking the current clip path and transformation into account. -The material is set by either a ColorOp for a constant color, or +The current brush is set by either a ColorOp for a constant color, or ImageOp for an image. */ package paint diff --git a/op/paint/paint.go b/op/paint/paint.go index 3daf5371..4c247d68 100644 --- a/op/paint/paint.go +++ b/op/paint/paint.go @@ -14,7 +14,7 @@ import ( "gioui.org/op" ) -// ImageOp sets the material to an image. +// ImageOp sets the brush to an image. type ImageOp struct { // Rect is the section if the backing image to use. Rect image.Rectangle @@ -28,15 +28,15 @@ type ImageOp struct { handle interface{} } -// ColorOp sets the material to a constant color. +// ColorOp sets the brush to a constant color. type ColorOp struct { Color color.RGBA } -// PaintOp draws the current material, respecting the +// PaintOp draws the current brush, respecting the // clip path and transformation. type PaintOp struct { - // The destination rectangle to paint. If necessary, the material is resized to + // The destination rectangle to paint. If necessary, the brush is resized to // cover it. Rect f32.Rectangle }