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>
88 lines
2.2 KiB
Go
88 lines
2.2 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image/color"
|
|
|
|
"gioui.org/internal/f32color"
|
|
"gioui.org/io/semantic"
|
|
"gioui.org/layout"
|
|
"gioui.org/op"
|
|
"gioui.org/op/paint"
|
|
"gioui.org/text"
|
|
"gioui.org/unit"
|
|
"gioui.org/widget"
|
|
)
|
|
|
|
type EditorStyle struct {
|
|
Font text.Font
|
|
TextSize unit.Sp
|
|
// Color is the text color.
|
|
Color color.NRGBA
|
|
// Hint contains the text displayed when the editor is empty.
|
|
Hint string
|
|
// HintColor is the color of hint text.
|
|
HintColor color.NRGBA
|
|
// SelectionColor is the color of the background for selected text.
|
|
SelectionColor color.NRGBA
|
|
Editor *widget.Editor
|
|
|
|
shaper text.Shaper
|
|
}
|
|
|
|
func Editor(th *Theme, editor *widget.Editor, hint string) EditorStyle {
|
|
return EditorStyle{
|
|
Editor: editor,
|
|
TextSize: th.TextSize,
|
|
Color: th.Palette.Fg,
|
|
shaper: th.Shaper,
|
|
Hint: hint,
|
|
HintColor: f32color.MulAlpha(th.Palette.Fg, 0xbb),
|
|
SelectionColor: f32color.MulAlpha(th.Palette.ContrastBg, 0x60),
|
|
}
|
|
}
|
|
|
|
func (e EditorStyle) Layout(gtx layout.Context) layout.Dimensions {
|
|
macro := op.Record(gtx.Ops)
|
|
paint.ColorOp{Color: e.HintColor}.Add(gtx.Ops)
|
|
var maxlines int
|
|
if e.Editor.SingleLine {
|
|
maxlines = 1
|
|
}
|
|
tl := widget.Label{Alignment: e.Editor.Alignment, MaxLines: maxlines}
|
|
dims := tl.Layout(gtx, e.shaper, e.Font, e.TextSize, e.Hint)
|
|
call := macro.Stop()
|
|
if w := dims.Size.X; gtx.Constraints.Min.X < w {
|
|
gtx.Constraints.Min.X = w
|
|
}
|
|
if h := dims.Size.Y; gtx.Constraints.Min.Y < h {
|
|
gtx.Constraints.Min.Y = h
|
|
}
|
|
dims = e.Editor.Layout(gtx, e.shaper, e.Font, e.TextSize, func(gtx layout.Context) layout.Dimensions {
|
|
semantic.Editor.Add(gtx.Ops)
|
|
disabled := gtx.Queue == nil
|
|
if e.Editor.Len() > 0 {
|
|
paint.ColorOp{Color: blendDisabledColor(disabled, e.SelectionColor)}.Add(gtx.Ops)
|
|
e.Editor.PaintSelection(gtx)
|
|
paint.ColorOp{Color: blendDisabledColor(disabled, e.Color)}.Add(gtx.Ops)
|
|
e.Editor.PaintText(gtx)
|
|
} else {
|
|
call.Add(gtx.Ops)
|
|
}
|
|
if !disabled {
|
|
paint.ColorOp{Color: e.Color}.Add(gtx.Ops)
|
|
e.Editor.PaintCaret(gtx)
|
|
}
|
|
return dims
|
|
})
|
|
return dims
|
|
}
|
|
|
|
func blendDisabledColor(disabled bool, c color.NRGBA) color.NRGBA {
|
|
if disabled {
|
|
return f32color.Disabled(c)
|
|
}
|
|
return c
|
|
}
|