forked from joejulian/gio
Thomas Bruyelle
ae8a377cda
The funcs replace stack.Push and macro.Record, which become private. This makes stack and macro faster to write, in particular for stacks where you can just write the following line to save and restore the state : defer op.Push(ops).Pop() This usage requires Push to return a pointer (since Pop has a pointer receiver), or else the code doesn't compile. For consistancy, I tried to do the same for op.Record, but this implied to turn all the MacroOp fields into pointers, and this caused some panics. As a result, op.Record doesn't return a pointer. An other side effect pointed by Larry Clapp: StackOp and MacroOp are not re-usable any more, you have to allocate a new one for each usage, using the described funcs above. Signed-off-by: Thomas Bruyelle <thomas.bruyelle@gmail.com>
65 lines
1.5 KiB
Go
65 lines
1.5 KiB
Go
// SPDX-License-Identifier: Unlicense OR MIT
|
|
|
|
package material
|
|
|
|
import (
|
|
"image/color"
|
|
|
|
"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.Value
|
|
// Color is the text color.
|
|
Color color.RGBA
|
|
// Hint contains the text displayed when the editor is empty.
|
|
Hint string
|
|
// HintColor is the color of hint text.
|
|
HintColor color.RGBA
|
|
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.Color.Text,
|
|
shaper: th.Shaper,
|
|
Hint: hint,
|
|
HintColor: th.Color.Hint,
|
|
}
|
|
}
|
|
|
|
func (e EditorStyle) Layout(gtx layout.Context) layout.Dimensions {
|
|
defer op.Push(gtx.Ops).Pop()
|
|
macro := op.Record(gtx.Ops)
|
|
paint.ColorOp{Color: e.HintColor}.Add(gtx.Ops)
|
|
tl := widget.Label{Alignment: e.Editor.Alignment}
|
|
dims := tl.Layout(gtx, e.shaper, e.Font, e.TextSize, e.Hint)
|
|
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)
|
|
if e.Editor.Len() > 0 {
|
|
paint.ColorOp{Color: e.Color}.Add(gtx.Ops)
|
|
e.Editor.PaintText(gtx)
|
|
} else {
|
|
macro.Add()
|
|
}
|
|
paint.ColorOp{Color: e.Color}.Add(gtx.Ops)
|
|
e.Editor.PaintCaret(gtx)
|
|
return dims
|
|
}
|