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

widget/material: move widget state object from Layout methods to constructors

Browse Source 
Instead of, say,

	var th *material.Theme
	var btn *widget.Clickable

	material.Button(th, "Click me").Layout(gtx, btn)

move the widget state objects to the constructor:

	material.Button(th, btn, "Click me").Layout(gtx)

The advatage is that several widgets can now be used without
wrapping them in function literals. For example,

	layout.Inset{}.Layout(gtx, func(gtx layout.Context) layout.Dimensions {
		material.Button(th, "Click me").Layout(gtx, btn)
	})

collapses to just

	layout.Inset{}.Layout(gtx, material.Button(th, btn, "Click me").Layout)

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2020-05-23 20:09:08 +02:00
parent 3af01a3f43
commit 2451750782
6 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widget/material/switch.go
+10 -8
View File
@@ -17,18 +17,20 @@ import (
)
type SwitchStyle struct {
Color color.RGBA
Color color.RGBA
Switch *widget.Bool
}
func Switch(th *Theme) SwitchStyle {
func Switch(th *Theme, swtch *widget.Bool) SwitchStyle {
return SwitchStyle{
Color: th.Color.Primary,
Switch: swtch,
Color: th.Color.Primary,
}
}
// Layout updates the checkBox and displays it.
func (s SwitchStyle) Layout(gtx layout.Context, swtch *widget.Bool) layout.Dimensions {
swtch.Update(gtx)
func (s SwitchStyle) Layout(gtx layout.Context) layout.Dimensions {
s.Switch.Update(gtx)
trackWidth := gtx.Px(unit.Dp(36))
trackHeight := gtx.Px(unit.Dp(16))
@@ -55,7 +57,7 @@ func (s SwitchStyle) Layout(gtx layout.Context, swtch *widget.Bool) layout.Dimen
// Compute thumb offset and color.
stack.Push(gtx.Ops)
col := rgb(0xffffff)
if swtch.Value {
if s.Switch.Value {
off := trackWidth - thumbSize
op.TransformOp{}.Offset(f32.Point{X: float32(off)}).Add(gtx.Ops)
col = s.Color
@@ -93,7 +95,7 @@ func (s SwitchStyle) Layout(gtx layout.Context, swtch *widget.Bool) layout.Dimen
},
NE: rr, NW: rr, SE: rr, SW: rr,
}.Op(gtx.Ops).Add(gtx.Ops)
drawInk(gtx, swtch.Last)
drawInk(gtx, s.Switch.Last)
stack.Pop()
// Set up click area.
@@ -109,7 +111,7 @@ func (s SwitchStyle) Layout(gtx layout.Context, swtch *widget.Bool) layout.Dimen
X: clickSize, Y: clickSize,
},
}).Add(gtx.Ops)
swtch.Layout(gtx)
s.Switch.Layout(gtx)
stack.Pop()
return layout.Dimensions{