From 1c880f2b9de5050997d4212077caa56482598063 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Sun, 2 Jun 2019 15:08:49 +0200 Subject: [PATCH] ui/layout: activate sanity checks for Stack Added by an earlier change, but not activated. Signed-off-by: Elias Naur --- ui/layout/stack.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/layout/stack.go b/ui/layout/stack.go index 1b6de4a3..6abf1051 100644 --- a/ui/layout/stack.go +++ b/ui/layout/stack.go @@ -56,23 +56,21 @@ func (s *Stack) begin(ops *ui.Ops) { } func (s *Stack) Rigid(ops *ui.Ops) Constraints { - ops.Begin() - ui.OpLayer{}.Add(ops) + s.begin(ops) return s.cs } func (s *Stack) Expand(ops *ui.Ops) Constraints { - cs := Constraints{ + s.begin(ops) + return Constraints{ Width: Constraint{Min: s.maxSZ.X, Max: s.maxSZ.X}, Height: Constraint{Min: s.maxSZ.Y, Max: s.maxSZ.Y}, } - ops.Begin() - ui.OpLayer{}.Add(ops) - return cs } func (s *Stack) End(ops *ui.Ops, dims Dimens) StackChild { b := ops.End() + s.begun = false if w := dims.Size.X; w > s.maxSZ.X { s.maxSZ.X = w }