ZacharyZhang-NY
b4b4d67b92
A cross-cutting pass, each fix with a test that failed first. Veils: MyGo still hands a key to a base that turned off this frame, so every element key now goes through pixel.Shortcut, which an archtest enforces. Input handlers record and the build applies them only while enabled; the editor turns away a veil-frame letter or copy; value bases get a copy and keep only enabled turns. Popups give a held focus back to their opener when the veil lifts. Motion: S5 is enforced at the clock. Every Tick, Since, Step, Toward and Shot runs at 4-15 fps; blinks keep 1 Hz on 4 fps steps, fast animations step at 15, and drawn time is quantized to frames. Clocks stepping back: Since holds at zero without overflow, and k.Elapsed moves a stored start to now, so nothing goes negative, runs backward or indexes out of range. Also: logs count typed text instead of holding it, gallery names use glyphs the font has, removable rows are keyed, components take their own Options (archtest), and sweeps over all 508 demos check veiled keys, clicks, wheels, the clock stepping back and names.
87 lines
2.2 KiB
Go
87 lines
2.2 KiB
Go
package input
|
|
|
|
import (
|
|
"log/slog"
|
|
"unicode/utf8"
|
|
|
|
"github.com/egoist/mygo/ui"
|
|
|
|
"git.zacharyzhang.com/ZacharyZhang-NY/8bitMyGoUI/pixel"
|
|
)
|
|
|
|
type EditableTextOptions struct {
|
|
Placeholder string
|
|
// Width is in dots; zero means 120.
|
|
Width int
|
|
Disabled bool
|
|
}
|
|
|
|
type EditableTextResult struct {
|
|
Element *ui.Element
|
|
Changed bool
|
|
}
|
|
|
|
type editableKey struct{}
|
|
|
|
type editable struct {
|
|
on, refocus bool
|
|
draft string
|
|
}
|
|
|
|
// EditableText edits on double click or Enter; Escape reverts.
|
|
func EditableText(c *ui.Context, text string, value *string, o EditableTextOptions) EditableTextResult {
|
|
k := pixel.K(c)
|
|
w := pixel.Or("EditableText Width", o.Width, 120)
|
|
box := ui.Box(c)
|
|
s := ui.Local(box, editableKey{}, func() editable { return editable{} })
|
|
res := EditableTextResult{Element: box}
|
|
if o.Disabled {
|
|
s.on = false
|
|
}
|
|
box.Children(func() {
|
|
if s.on {
|
|
ed, e := field(c, &s.draft, pixel.EditorOptions{Label: text, Placeholder: o.Placeholder}, w, nil, nil, nil)
|
|
ed.Input.AutoFocus()
|
|
// Keys reach the wrapper; the editor's state gates them.
|
|
on := !ed.Input.IsDisabled()
|
|
enter, escape := on && pixel.Shortcut(e, 0, ui.KeyEnter), on && pixel.Shortcut(e, 0, ui.KeyEscape)
|
|
if enter {
|
|
res.Changed = *value != s.draft
|
|
*value = s.draft
|
|
}
|
|
if enter || escape {
|
|
s.on, s.refocus = false, true
|
|
}
|
|
return
|
|
}
|
|
shell, base, st := pixel.Shell(c, func() *ui.Element {
|
|
return ui.Box(c).Focusable().Role(ui.RoleButton).Label(text).Description(*value).Disabled(o.Disabled)
|
|
})
|
|
if s.refocus {
|
|
base.Focus()
|
|
s.refocus = false
|
|
}
|
|
enter, double := pixel.Shortcut(base, 0, ui.KeyEnter), base.DoubleClicked()
|
|
if enter || double {
|
|
s.on, s.draft = true, *value
|
|
}
|
|
shell.Size(k.D(w), k.D(pixel.LineHeight+6)).Draw(func(p *ui.Painter, r ui.Rect) {
|
|
g := k.Canvas(p, r)
|
|
if st.Hover {
|
|
g.Rect(0, 0, g.W, g.H, pixel.Lit)
|
|
}
|
|
shown, ink := *value, pixel.Ink
|
|
if shown == "" {
|
|
shown, ink = o.Placeholder, pixel.Faint
|
|
}
|
|
g.Text(4, 3, shown, ink, 1)
|
|
g.Veil(0, g.H-1, g.W, 1, pixel.Faint, 8)
|
|
g.Finish(st)
|
|
})
|
|
})
|
|
if res.Changed {
|
|
slog.Debug("8bit: text edited", "label", text, "runes", utf8.RuneCountInString(*value))
|
|
}
|
|
return res
|
|
}
|