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

ui: remove ui.Ops parameters from layouts and path builder structs

Browse Source 
Layouts and path builders are transient and need an ops list for
operation. However, instead of passing the ops list to every method,
pass the list in an init method and store it for subsequent methods.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-06-03 16:08:38 +02:00
parent 60fd129fda
commit df791f2e9b
6 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/layout/stack.go
+17 -15
View File
@@ -11,6 +11,7 @@ import (
type Stack struct {
Alignment Direction
ops *ui.Ops
constrained bool
cs Constraints
begun bool
@@ -36,14 +37,15 @@ const (
W
)
func (s *Stack) Init(cs Constraints) {
func (s *Stack) Init(ops *ui.Ops, cs Constraints) {
s.ops = ops
s.cs = cs
s.constrained = true
s.maxSZ = image.Point{}
s.baseline = 0
}
func (s *Stack) begin(ops *ui.Ops) {
func (s *Stack) begin() {
if !s.constrained {
panic("must Constrain before adding a child")
}
@@ -51,25 +53,25 @@ func (s *Stack) begin(ops *ui.Ops) {
panic("must End before adding a child")
}
s.begun = true
ops.Begin()
ui.OpLayer{}.Add(ops)
s.ops.Begin()
ui.OpLayer{}.Add(s.ops)
}
func (s *Stack) Rigid(ops *ui.Ops) Constraints {
s.begin(ops)
func (s *Stack) Rigid() Constraints {
s.begin()
return s.cs
}
func (s *Stack) Expand(ops *ui.Ops) Constraints {
s.begin(ops)
func (s *Stack) Expand() Constraints {
s.begin()
return Constraints{
Width: Constraint{Min: s.maxSZ.X, Max: s.maxSZ.X},
Height: Constraint{Min: s.maxSZ.Y, Max: s.maxSZ.Y},
}
}
func (s *Stack) End(ops *ui.Ops, dims Dimens) StackChild {
b := ops.End()
func (s *Stack) End(dims Dimens) StackChild {
b := s.ops.End()
s.begun = false
if w := dims.Size.X; w > s.maxSZ.X {
s.maxSZ.X = w
@@ -85,7 +87,7 @@ func (s *Stack) End(ops *ui.Ops, dims Dimens) StackChild {
return StackChild{b, dims}
}
func (s *Stack) Layout(ops *ui.Ops, children ...StackChild) Dimens {
func (s *Stack) Layout(children ...StackChild) Dimens {
for _, ch := range children {
sz := ch.dims.Size
var p image.Point
@@ -101,10 +103,10 @@ func (s *Stack) Layout(ops *ui.Ops, children ...StackChild) Dimens {
case SW, S, SE:
p.Y = s.maxSZ.Y - sz.Y
}
ui.OpPush{}.Add(ops)
ui.OpTransform{Transform: ui.Offset(toPointF(p))}.Add(ops)
ch.block.Add(ops)
ui.OpPop{}.Add(ops)
ui.OpPush{}.Add(s.ops)
ui.OpTransform{Transform: ui.Offset(toPointF(p))}.Add(s.ops)
ch.block.Add(s.ops)
ui.OpPop{}.Add(s.ops)
}
b := s.baseline
if b == 0 {