mixeme
60aceb75af
Part A stages 1-3 of the GUI layout cleanup plan: - Stage 1 (F1-F3): delete settingsControlWidth's redundant wrapper (the Border centre slot already stretches controls), truncate the config path label, and name the default window size so it can be asserted against. Settings no longer widens the window past what it asks for. - Stage 2 (F4-F5): drop compactVBoxLayout for the stock layout.NewCustomPaddedVBoxLayout and a single derived rowOverlap() spacing, replacing three hand-tuned spacing constants. - Stage 3 (F7): delete the inert 400px sidebar width floor; the Border left slot already renders it at content MinSize. See docs/PLAN-gui-layout.md.
119 lines
3.3 KiB
Go
119 lines
3.3 KiB
Go
package ui
|
|
|
|
import (
|
|
"fyne.io/fyne/v2"
|
|
"fyne.io/fyne/v2/theme"
|
|
)
|
|
|
|
type minWidthLayout struct {
|
|
width float32
|
|
}
|
|
|
|
func (l minWidthLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
|
width := l.width
|
|
var height float32
|
|
for _, object := range objects {
|
|
if !object.Visible() {
|
|
continue
|
|
}
|
|
min := object.MinSize()
|
|
if min.Width > width {
|
|
width = min.Width
|
|
}
|
|
if min.Height > height {
|
|
height = min.Height
|
|
}
|
|
}
|
|
return fyne.NewSize(width, height)
|
|
}
|
|
|
|
func (l minWidthLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
|
for _, object := range objects {
|
|
if !object.Visible() {
|
|
continue
|
|
}
|
|
object.Move(fyne.NewPos(0, 0))
|
|
object.Resize(size)
|
|
}
|
|
}
|
|
|
|
// rowOverlap is the (negative) gap that pulls stacked label rows together by
|
|
// exactly one label's vertical inner padding. Two adjacent labels each inset
|
|
// their text by theme.InnerPadding(), so the whitespace between two lines of
|
|
// text is double what a single row needs; removing one label's worth
|
|
// condenses the block without letting the text lines touch. Derived rather
|
|
// than hard-coded so it follows a theme that changes SizeNameInnerPadding.
|
|
func rowOverlap() float32 { return -theme.InnerPadding() }
|
|
|
|
// fixedHeightLayout forces its contents to a fixed height while leaving the
|
|
// width to the parent container. It is used to reserve a stable amount of space
|
|
// for the activity panel so a neighbouring widget can absorb the rest.
|
|
type fixedHeightLayout struct {
|
|
height float32
|
|
}
|
|
|
|
func (l fixedHeightLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
|
var width float32
|
|
for _, object := range objects {
|
|
if !object.Visible() {
|
|
continue
|
|
}
|
|
if min := object.MinSize(); min.Width > width {
|
|
width = min.Width
|
|
}
|
|
}
|
|
return fyne.NewSize(width, l.height)
|
|
}
|
|
|
|
func (l fixedHeightLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
|
for _, object := range objects {
|
|
if !object.Visible() {
|
|
continue
|
|
}
|
|
object.Move(fyne.NewPos(0, 0))
|
|
object.Resize(fyne.NewSize(size.Width, l.height))
|
|
}
|
|
}
|
|
|
|
// captionValueLayout places a fixed-width caption on the left and lets the value
|
|
// fill the remaining width, separated by one theme padding. Capping the caption
|
|
// stops it from growing with the window (as an even two-column grid would), so
|
|
// the extra space a wider window provides goes entirely to the value column. It
|
|
// expects exactly two children: caption first, value second.
|
|
type captionValueLayout struct {
|
|
captionWidth float32
|
|
}
|
|
|
|
func (l captionValueLayout) MinSize(objects []fyne.CanvasObject) fyne.Size {
|
|
if len(objects) != 2 {
|
|
return fyne.Size{}
|
|
}
|
|
captionMin, valueMin := objects[0].MinSize(), objects[1].MinSize()
|
|
height := captionMin.Height
|
|
if valueMin.Height > height {
|
|
height = valueMin.Height
|
|
}
|
|
return fyne.NewSize(l.captionWidth+theme.Padding()+valueMin.Width, height)
|
|
}
|
|
|
|
func (l captionValueLayout) Layout(objects []fyne.CanvasObject, size fyne.Size) {
|
|
if len(objects) != 2 {
|
|
return
|
|
}
|
|
caption, value := objects[0], objects[1]
|
|
captionWidth := l.captionWidth
|
|
if captionWidth > size.Width {
|
|
captionWidth = size.Width
|
|
}
|
|
caption.Move(fyne.NewPos(0, 0))
|
|
caption.Resize(fyne.NewSize(captionWidth, size.Height))
|
|
|
|
valueX := captionWidth + theme.Padding()
|
|
valueWidth := size.Width - valueX
|
|
if valueWidth < 0 {
|
|
valueWidth = 0
|
|
}
|
|
value.Move(fyne.NewPos(valueX, 0))
|
|
value.Resize(fyne.NewSize(valueWidth, size.Height))
|
|
}
|