mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-01 15:45:38 +00:00
Elias Naur
3d37491342
The unit.Value is a struct and thus more inconvenient to use than its
underlying float32 type. In addition, most uses don't need a general
value, but rather a specific unit given by the context. This change
replaces unit.Value with two float32 units, Dp and Sp. It also changes
variables and parameters of unit.Value to a specific unit type matching
the context. That is, unit.Dp everywhere except for text sizes which are
in Sp.
Switching to typed float32s has multiple advantages
- They can be constants:
const touchSlop = unit.Dp(16)
- Casting untyped constants is no longer necessary:
insets := layout.UniformInset(16)
- Calculation with values is natural:
func (s ScrollbarStyle) Width() unit.Dp {
return s.Indicator.MinorWidth + s.Track.MinorPadding + s.Track.MinorPadding
}
The main API change is that calls to gtx.Px must be replaced with either
gtx.Dp or gtx.Sp depending on the unit.
Idea by Christophe Meessen.
Signed-off-by: Elias Naur <mail@eliasnaur.com>
91 lines
2.0 KiB
Go
91 lines
2.0 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image/color"
|
|
|
|
"golang.org/x/exp/shiny/materialdesign/icons"
|
|
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
)
|
|
|
|
// Palette contains the minimal set of colors that a widget may need to
|
|
// draw itself.
|
|
type Palette struct {
|
|
// Bg is the background color atop which content is currently being
|
|
// drawn.
|
|
Bg color.NRGBA
|
|
|
|
// Fg is a color suitable for drawing on top of Bg.
|
|
Fg color.NRGBA
|
|
|
|
// ContrastBg is a color used to draw attention to active,
|
|
// important, interactive widgets such as buttons.
|
|
ContrastBg color.NRGBA
|
|
|
|
// ContrastFg is a color suitable for content drawn on top of
|
|
// ContrastBg.
|
|
ContrastFg color.NRGBA
|
|
}
|
|
|
|
type Theme struct {
|
|
Shaper text.Shaper
|
|
Palette
|
|
TextSize unit.Sp
|
|
Icon struct {
|
|
CheckBoxChecked *widget.Icon
|
|
CheckBoxUnchecked *widget.Icon
|
|
RadioChecked *widget.Icon
|
|
RadioUnchecked *widget.Icon
|
|
}
|
|
|
|
// FingerSize is the minimum touch target size.
|
|
FingerSize unit.Dp
|
|
}
|
|
|
|
func NewTheme(fontCollection []text.FontFace) *Theme {
|
|
t := &Theme{
|
|
Shaper: text.NewCache(fontCollection),
|
|
}
|
|
t.Palette = Palette{
|
|
Fg: rgb(0x000000),
|
|
Bg: rgb(0xffffff),
|
|
ContrastBg: rgb(0x3f51b5),
|
|
ContrastFg: rgb(0xffffff),
|
|
}
|
|
t.TextSize = 16
|
|
|
|
t.Icon.CheckBoxChecked = mustIcon(widget.NewIcon(icons.ToggleCheckBox))
|
|
t.Icon.CheckBoxUnchecked = mustIcon(widget.NewIcon(icons.ToggleCheckBoxOutlineBlank))
|
|
t.Icon.RadioChecked = mustIcon(widget.NewIcon(icons.ToggleRadioButtonChecked))
|
|
t.Icon.RadioUnchecked = mustIcon(widget.NewIcon(icons.ToggleRadioButtonUnchecked))
|
|
|
|
// 38dp is on the lower end of possible finger size.
|
|
t.FingerSize = 38
|
|
|
|
return t
|
|
}
|
|
|
|
func (t Theme) WithPalette(p Palette) Theme {
|
|
t.Palette = p
|
|
return t
|
|
}
|
|
|
|
func mustIcon(ic *widget.Icon, err error) *widget.Icon {
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return ic
|
|
}
|
|
|
|
func rgb(c uint32) color.NRGBA {
|
|
return argb(0xff000000 | c)
|
|
}
|
|
|
|
func argb(c uint32) color.NRGBA {
|
|
return color.NRGBA{A: uint8(c >> 24), R: uint8(c >> 16), G: uint8(c >> 8), B: uint8(c)}
|
|
}
|