joejulian/gio-patched
1
0
Fork 0
forked from joejulian/gio
Code Pull Requests 1 Activity

widget/material: add hover to Button

Browse Source 
Signed-off-by: Egon Elbre <egonelbre@gmail.com>
This commit is contained in:
Egon Elbre
2021-01-17 17:51:57 +02:00
committed by Elias Naur
parent 93ebd51531
commit 468bd6f53a
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/f32color/rgba.go
+11
View File
@@ -172,6 +172,17 @@ func Disabled(c color.NRGBA) (d color.NRGBA) {
}
}
// Hovered blends color towards a brighter color.
func Hovered(c color.NRGBA) (d color.NRGBA) {
const r = 0x20 // lighten ratio
return color.NRGBA{
R: byte(255 - int(255-c.R)*(255-r)/256),
G: byte(255 - int(255-c.G)*(255-r)/256),
B: byte(255 - int(255-c.B)*(255-r)/256),
A: c.A,
}
}
// approxLuminance is a fast approximate version of RGBA.Luminance.
func approxLuminance(c color.NRGBA) byte {
const (
widget/material/button.go
+8 -2
View File
@@ -128,8 +128,11 @@ func (b ButtonLayoutStyle) Layout(gtx layout.Context, w layout.Widget) layout.Di
Y: float32(gtx.Constraints.Min.Y),
}}, rr).Add(gtx.Ops)
background := b.Background
if gtx.Queue == nil {
switch {
case gtx.Queue == nil:
background = f32color.Disabled(b.Background)
case b.Button.Hovered():
background = f32color.Hovered(b.Background)
}
paint.Fill(gtx.Ops, background)
for _, c := range b.Button.History() {
@@ -155,8 +158,11 @@ func (b IconButtonStyle) Layout(gtx layout.Context) layout.Dimensions {
Max: f32.Point{X: sizexf, Y: sizeyf},
}, rr).Add(gtx.Ops)
background := b.Background
if gtx.Queue == nil {
switch {
case gtx.Queue == nil:
background = f32color.Disabled(b.Background)
case b.Button.Hovered():
background = f32color.Hovered(b.Background)
}
paint.Fill(gtx.Ops, background)
for _, c := range b.Button.History() {