From 7a5013864055cab6071d8772726f43aded799117 Mon Sep 17 00:00:00 2001 From: Joe Julian Date: Wed, 8 Apr 2026 17:43:17 -0700 Subject: [PATCH] Align Android header menus --- main.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 3815c5b..11d860e 100644 --- a/main.go +++ b/main.go @@ -5521,7 +5521,7 @@ func (u *ui) header(gtx layout.Context) layout.Dimensions { if !u.syncMenuOpen && !u.mainMenuOpen { return layout.Dimensions{} } - return layout.Inset{Top: unit.Dp(6)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions { + return layout.Inset{Top: unit.Dp(6), Left: unit.Dp(16), Right: unit.Dp(16)}.Layout(gtx, func(gtx layout.Context) layout.Dimensions { return layout.E.Layout(gtx, func(gtx layout.Context) layout.Dimensions { var menu layout.Widget if u.syncMenuOpen { @@ -5531,6 +5531,7 @@ func (u *ui) header(gtx layout.Context) layout.Dimensions { } measureGTX := gtx measureGTX.Constraints.Min = image.Point{} + measureGTX.Constraints.Max.X = gtx.Constraints.Max.X macro := op.Record(gtx.Ops) dims := menu(measureGTX) _ = macro.Stop() @@ -6008,10 +6009,15 @@ func (u *ui) syncMenu(gtx layout.Context) layout.Dimensions { func intrinsicCompactCard(gtx layout.Context, w layout.Widget) layout.Dimensions { measureGTX := gtx measureGTX.Constraints.Min = image.Point{} + measureGTX.Constraints.Max.X = gtx.Constraints.Max.X macro := op.Record(gtx.Ops) contentDims := w(measureGTX) _ = macro.Stop() width := contentDims.Size.X + gtx.Dp(unit.Dp(20)) + maxWidth := gtx.Constraints.Max.X + if maxWidth > 0 && width > maxWidth { + width = maxWidth + } if width > 0 { gtx.Constraints.Min.X = width gtx.Constraints.Max.X = width @@ -7619,9 +7625,6 @@ func menuActionWidth(gtx layout.Context, rows []layout.Widget) int { } func rightAlignedMenuAction(gtx layout.Context, width int, child layout.Widget) layout.Dimensions { - if width < gtx.Constraints.Max.X { - width = gtx.Constraints.Max.X - } if width <= 0 { return child(gtx) }