joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

ui/layout: restore Flex.Rigid behaviour

Browse Source 
Broken by 5f2adf9b2f.

Clamp to 0 while we're here.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-07-30 15:25:23 +02:00
parent 5bf5f1e64d
commit 3d9861011e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/layout/flex.go
+4 -1
View File
@@ -81,7 +81,10 @@ func (f *Flex) begin(mode flexMode) {
func (f *Flex) Rigid() Constraints { func (f *Flex) Rigid() Constraints {
f.begin(modeRigid) f.begin(modeRigid)
mainc := axisMainConstraint(f.Axis, f.cs) 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)) return axisConstraints(f.Axis, Constraint{Max: mainMax}, axisCrossConstraint(f.Axis, f.cs))
} }