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

layout: adjust only max constraints on Inset

Browse Source 
Only adjust minimums, and insets, if necessary.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-10-15 23:56:38 +02:00
parent 8234e8485c
commit 4bbad66947
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/layout.go
+13 -11
View File
@@ -145,21 +145,23 @@ func (in Inset) Layout(gtx *Context, w Widget) {
bottom := gtx.Px(in.Bottom) bottom := gtx.Px(in.Bottom)
left := gtx.Px(in.Left) left := gtx.Px(in.Left)
mcs := gtx.Constraints mcs := gtx.Constraints
mcs.Width.Min -= left + right
mcs.Width.Max -= left + right mcs.Width.Max -= left + right
if mcs.Width.Min < 0 { if mcs.Width.Max < 0 {
mcs.Width.Min = 0 left = 0
right = 0
mcs.Width.Max = 0
} }
if mcs.Width.Max < mcs.Width.Min { if mcs.Width.Min > mcs.Width.Max {
mcs.Width.Max = mcs.Width.Min mcs.Width.Min = mcs.Width.Max
} }
mcs.Height.Min -= top + bottom
mcs.Height.Max -= top + bottom mcs.Height.Max -= top + bottom
if mcs.Height.Min < 0 { if mcs.Height.Max < 0 {
mcs.Height.Min = 0 bottom = 0
top = 0
mcs.Height.Max = 0
} }
if mcs.Height.Max < mcs.Height.Min { if mcs.Height.Min > mcs.Height.Max {
mcs.Height.Max = mcs.Height.Min mcs.Height.Min = mcs.Height.Max
} }
var stack op.StackOp var stack op.StackOp
stack.Push(gtx.Ops) stack.Push(gtx.Ops)
@@ -167,7 +169,7 @@ func (in Inset) Layout(gtx *Context, w Widget) {
dims := gtx.Layout(mcs, w) dims := gtx.Layout(mcs, w)
stack.Pop() stack.Pop()
gtx.Dimensions = Dimensions{ gtx.Dimensions = Dimensions{
Size: gtx.Constraints.Constrain(dims.Size.Add(image.Point{X: right + left, Y: top + bottom})), Size: dims.Size.Add(image.Point{X: right + left, Y: top + bottom}),
Baseline: dims.Baseline + top, Baseline: dims.Baseline + top,
} }
} }