From 3d9861011e24132d4b366017f21452346c6a7de9 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Tue, 30 Jul 2019 15:25:23 +0200 Subject: [PATCH] ui/layout: restore Flex.Rigid behaviour Broken by 5f2adf9b2f2290e1ed82e96ca864ede354c25b43. Clamp to 0 while we're here. Signed-off-by: Elias Naur --- ui/layout/flex.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/layout/flex.go b/ui/layout/flex.go index 0c5bbe88..91c479f3 100644 --- a/ui/layout/flex.go +++ b/ui/layout/flex.go @@ -81,7 +81,10 @@ func (f *Flex) begin(mode flexMode) { func (f *Flex) Rigid() Constraints { f.begin(modeRigid) mainc := axisMainConstraint(f.Axis, f.cs) - mainMax := mainc.Max + mainMax := mainc.Max - f.size + if mainMax < 0 { + mainMax = 0 + } return axisConstraints(f.Axis, Constraint{Max: mainMax}, axisCrossConstraint(f.Axis, f.cs)) }