ui: merge Transform into TransformOp

The separate Transform type is not worth its weight.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-29 01:02:26 -07:00
parent d178167c3b
commit 5e1f078b12
9 changed files with 29 additions and 39 deletions
+1 -3
View File
@@ -159,9 +159,7 @@ func (f *Flex) Layout(children ...FlexChild) Dimens {
}
var stack ui.StackOp
stack.Push(f.ops)
ui.TransformOp{
Transform: ui.Offset(toPointF(axisPoint(f.Axis, mainSize, cross))),
}.Add(f.ops)
ui.TransformOp{}.Offset(toPointF(axisPoint(f.Axis, mainSize, cross))).Add(f.ops)
child.macro.Add(f.ops)
stack.Pop()
mainSize += axisMain(f.Axis, dims.Size)
+2 -2
View File
@@ -96,7 +96,7 @@ func (in *Inset) Begin(c ui.Config, ops *ui.Ops, cs Constraints) Constraints {
}
}
in.stack.Push(ops)
ui.TransformOp{Transform: ui.Offset(toPointF(image.Point{X: in.left, Y: in.top}))}.Add(ops)
ui.TransformOp{}.Offset(toPointF(image.Point{X: in.left, Y: in.top})).Add(ops)
return mcs
}
@@ -169,7 +169,7 @@ func (a *Align) End(dims Dimens) Dimens {
}
var stack ui.StackOp
stack.Push(ops)
ui.TransformOp{Transform: ui.Offset(toPointF(p))}.Add(ops)
ui.TransformOp{}.Offset(toPointF(p)).Add(ops)
a.macro.Add(ops)
stack.Pop()
return Dimens{
+1 -3
View File
@@ -229,9 +229,7 @@ func (l *List) Layout() Dimens {
var stack ui.StackOp
stack.Push(ops)
draw.RectClip(r).Add(ops)
ui.TransformOp{
Transform: ui.Offset(toPointF(axisPoint(l.Axis, transPos, cross))),
}.Add(ops)
ui.TransformOp{}.Offset(toPointF(axisPoint(l.Axis, transPos, cross))).Add(ops)
child.macro.Add(ops)
stack.Pop()
pos += childSize
+1 -1
View File
@@ -106,7 +106,7 @@ func (s *Stack) Layout(children ...StackChild) Dimens {
}
var stack ui.StackOp
stack.Push(s.ops)
ui.TransformOp{Transform: ui.Offset(toPointF(p))}.Add(s.ops)
ui.TransformOp{}.Offset(toPointF(p)).Add(s.ops)
ch.macro.Add(s.ops)
stack.Pop()
}