forked from joejulian/gio
Elias Naur
4bab6fcf32
Package material's ad-hoc mulAlpha didn't take the sRGB color-space into account, which meant that alpha-scaled colors were subtly wrong. Introduce f32color.MulAlpha and convert all uses to it. Thanks to René Post for finding and debugging the issue. Signed-off-by: Elias Naur <mail@eliasnaur.com>
76 lines
1.7 KiB
Go
76 lines
1.7 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image"
|
|
"image/color"
|
|
|
|
"gioui.org/f32"
|
|
"gioui.org/internal/f32color"
|
|
"gioui.org/layout"
|
|
"gioui.org/op/clip"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/unit"
|
|
)
|
|
|
|
type ProgressBarStyle struct {
|
|
Color color.RGBA
|
|
Progress int
|
|
}
|
|
|
|
func ProgressBar(th *Theme, progress int) ProgressBarStyle {
|
|
return ProgressBarStyle{
|
|
Progress: progress,
|
|
Color: th.Color.Primary,
|
|
}
|
|
}
|
|
|
|
func (p ProgressBarStyle) Layout(gtx layout.Context) layout.Dimensions {
|
|
shader := func(width float32, color color.RGBA) layout.Dimensions {
|
|
maxHeight := unit.Dp(4)
|
|
rr := float32(gtx.Px(unit.Dp(2)))
|
|
|
|
d := image.Point{X: int(width), Y: gtx.Px(maxHeight)}
|
|
dr := f32.Rectangle{
|
|
Max: f32.Point{X: float32(d.X), Y: float32(d.Y)},
|
|
}
|
|
|
|
clip.RRect{
|
|
Rect: f32.Rectangle{Max: f32.Point{X: width, Y: float32(gtx.Px(maxHeight))}},
|
|
NE: rr, NW: rr, SE: rr, SW: rr,
|
|
}.Add(gtx.Ops)
|
|
|
|
paint.ColorOp{Color: color}.Add(gtx.Ops)
|
|
paint.PaintOp{Rect: dr}.Add(gtx.Ops)
|
|
|
|
return layout.Dimensions{Size: d}
|
|
}
|
|
|
|
progress := p.Progress
|
|
if progress > 100 {
|
|
progress = 100
|
|
} else if progress < 0 {
|
|
progress = 0
|
|
}
|
|
|
|
progressBarWidth := float32(gtx.Constraints.Max.X)
|
|
|
|
return layout.Stack{Alignment: layout.W}.Layout(gtx,
|
|
layout.Stacked(func(gtx layout.Context) layout.Dimensions {
|
|
// Use a transparent equivalent of progress color.
|
|
bgCol := f32color.MulAlpha(p.Color, 150)
|
|
|
|
return shader(progressBarWidth, bgCol)
|
|
}),
|
|
layout.Stacked(func(gtx layout.Context) layout.Dimensions {
|
|
fillWidth := (progressBarWidth / 100) * float32(progress)
|
|
fillColor := p.Color
|
|
if gtx.Queue == nil {
|
|
fillColor = f32color.MulAlpha(fillColor, 200)
|
|
}
|
|
return shader(fillWidth, fillColor)
|
|
}),
|
|
)
|
|
}
|