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

all: remove redundant op.TransformOp.Offset

Browse Source 
Use op.Offset instead, or create and manipulate a f32.Affine2D.

API change. Update your code with a gofmt rule:

	gofmt -r 'op.TransformOp{}.Offset -> op.Offset'

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-06-21 22:41:56 +02:00
parent 9e3d3b6f58
commit 878131189b
11 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/editor.go
+1 -1
View File
@@ -405,7 +405,7 @@ func (e *Editor) PaintText(gtx layout.Context) {
clip.Max = clip.Max.Add(e.viewSize)
for _, shape := range e.shapes {
stack := op.Push(gtx.Ops)
op.TransformOp{}.Offset(shape.offset).Add(gtx.Ops)
op.Offset(shape.offset).Add(gtx.Ops)
shape.clip.Add(gtx.Ops)
paint.PaintOp{Rect: layout.FRect(clip).Sub(shape.offset)}.Add(gtx.Ops)
stack.Pop()
widget/label.go
+1 -1
View File
@@ -108,7 +108,7 @@ func (l Label) Layout(gtx layout.Context, s text.Shaper, font text.Font, size un
}
lclip := layout.FRect(clip).Sub(off)
stack := op.Push(gtx.Ops)
op.TransformOp{}.Offset(off).Add(gtx.Ops)
op.Offset(off).Add(gtx.Ops)
str := txt[start:end]
s.ShapeString(font, textSize, str, l).Add(gtx.Ops)
paint.PaintOp{Rect: lclip}.Add(gtx.Ops)
widget/material/button.go
+2 -2
View File
@@ -281,10 +281,10 @@ func drawInk(gtx layout.Context, c widget.Press) {
ink := paint.ColorOp{Color: color.RGBA{A: ba, R: bc, G: bc, B: bc}}
ink.Add(gtx.Ops)
rr := size * .5
op.TransformOp{}.Offset(c.Position).Offset(f32.Point{
op.Offset(c.Position.Add(f32.Point{
X: -rr,
Y: -rr,
}).Add(gtx.Ops)
})).Add(gtx.Ops)
clip.Rect{
Rect: f32.Rectangle{Max: f32.Point{
X: float32(size),
widget/material/switch.go
+5 -5
View File
@@ -55,7 +55,7 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
col = mulAlpha(col, 150)
}
trackColor := mulAlpha(col, 150)
op.TransformOp{}.Offset(f32.Point{Y: trackOff}).Add(gtx.Ops)
op.Offset(f32.Point{Y: trackOff}).Add(gtx.Ops)
clip.Rect{
Rect: trackRect,
NE: trackCorner, NW: trackCorner, SE: trackCorner, SW: trackCorner,
@@ -72,7 +72,7 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
X: float32(trackWidth)*.5 - rr,
Y: -rr + float32(trackHeight)*.5 + trackOff,
}
op.TransformOp{}.Offset(inkOff).Add(gtx.Ops)
op.Offset(inkOff).Add(gtx.Ops)
gtx.Constraints.Min = image.Pt(inkSize, inkSize)
clip.Rect{
Rect: f32.Rectangle{
@@ -89,7 +89,7 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
stack = op.Push(gtx.Ops)
if s.Switch.Value {
off := trackWidth - thumbSize
op.TransformOp{}.Offset(f32.Point{X: float32(off)}).Add(gtx.Ops)
op.Offset(f32.Point{X: float32(off)}).Add(gtx.Ops)
}
// Draw thumb shadow, a translucent disc slightly larger than the
@@ -97,7 +97,7 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
shadowStack := op.Push(gtx.Ops)
shadowSize := float32(2)
// Center shadow horizontally and slightly adjust its Y.
op.TransformOp{}.Offset(f32.Point{X: -shadowSize / 2, Y: -.75}).Add(gtx.Ops)
op.Offset(f32.Point{X: -shadowSize / 2, Y: -.75}).Add(gtx.Ops)
drawDisc(gtx.Ops, float32(thumbSize)+shadowSize, argb(0x55000000))
shadowStack.Pop()
@@ -112,7 +112,7 @@ func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
X: (float32(trackWidth) - float32(clickSize)) * .5,
Y: (float32(trackHeight)-float32(clickSize))*.5 + trackOff,
}
op.TransformOp{}.Offset(clickOff).Add(gtx.Ops)
op.Offset(clickOff).Add(gtx.Ops)
sz := image.Pt(clickSize, clickSize)
pointer.Ellipse(image.Rectangle{Max: sz}).Add(gtx.Ops)
gtx.Constraints.Min = sz