mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 07:35:40 +00:00
Chris Waldon
b3918ce40f
This commit ensures that the dimensions returned by material.List include the size of the scrollbar when the scrollbar is set to the Occupy AnchorStrategy. Signed-off-by: Chris Waldon <christopher.waldon.dev@gmail.com>
67 lines
1.8 KiB
Go
67 lines
1.8 KiB
Go
package material_test
|
|
|
|
import (
|
|
"image"
|
|
"testing"
|
|
"time"
|
|
|
|
"gioui.org/font/gofont"
|
|
"gioui.org/io/system"
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
"gioui.org/widget/material"
|
|
)
|
|
|
|
func TestListAnchorStrategies(t *testing.T) {
|
|
var ops op.Ops
|
|
gtx := layout.NewContext(&ops, system.FrameEvent{
|
|
Metric: unit.Metric{
|
|
PxPerDp: 1,
|
|
PxPerSp: 1,
|
|
},
|
|
Now: time.Now(),
|
|
Size: image.Point{
|
|
X: 500,
|
|
Y: 500,
|
|
},
|
|
})
|
|
|
|
var spaceConstraints layout.Constraints
|
|
space := func(gtx layout.Context, index int) layout.Dimensions {
|
|
spaceConstraints = gtx.Constraints
|
|
return layout.Dimensions{Size: image.Point{
|
|
X: gtx.Constraints.Max.X,
|
|
Y: gtx.Px(unit.Dp(20)),
|
|
}}
|
|
}
|
|
|
|
var list widget.List
|
|
list.Axis = layout.Vertical
|
|
elements := 100
|
|
th := material.NewTheme(gofont.Collection())
|
|
materialList := material.List(th, &list)
|
|
indicatorWidth := gtx.Px(materialList.Width(gtx.Metric))
|
|
|
|
materialList.AnchorStrategy = material.Occupy
|
|
occupyDims := materialList.Layout(gtx, elements, space)
|
|
occupyConstraints := spaceConstraints
|
|
|
|
materialList.AnchorStrategy = material.Overlay
|
|
overlayDims := materialList.Layout(gtx, elements, space)
|
|
overlayConstraints := spaceConstraints
|
|
|
|
// Both anchor strategies should use all space available if their elements do.
|
|
if occupyDims != overlayDims {
|
|
t.Errorf("expected occupy dims (%v) to be equal to overlay dims (%v)", occupyDims, overlayDims)
|
|
}
|
|
// The overlay strategy should not reserve any space for the scroll indicator,
|
|
// so the constraints that it presents to its elements should be larger than
|
|
// those presented by the occupy strategy.
|
|
if overlayConstraints.Max.X != occupyConstraints.Max.X+indicatorWidth {
|
|
t.Errorf("overlay max width (%d) != occupy max width (%d) + indicator width (%d)",
|
|
overlayConstraints.Max.X, occupyConstraints.Max.X, indicatorWidth)
|
|
}
|
|
}
|