joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-06 01:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/text: move Config parameter from Editor.Update to Editor state

Browse Source 
Assume the user will set a Config pointer once at init.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-06-21 15:27:57 +02:00
parent a695a115ce
commit dda9e3486d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/text/editor.go
+11 -10
View File
@@ -20,12 +20,13 @@ import (
) )
type Editor struct { type Editor struct {
Config *ui.Config
Face Face Face Face
Alignment Alignment Alignment Alignment
SingleLine bool SingleLine bool
Submit bool Submit bool
cfg *ui.Config oldCfg ui.Config
blinkStart time.Time blinkStart time.Time
focused bool focused bool
rr editBuffer rr editBuffer
@@ -65,11 +66,11 @@ const (
func (s Submission) isEditorEvent() {} func (s Submission) isEditorEvent() {}
func (e *Editor) Update(c *ui.Config, q input.Events) []EditorEvent { func (e *Editor) Update(q input.Events) []EditorEvent {
if e.cfg == nil || c.PxPerDp != e.cfg.PxPerDp || c.PxPerSp != e.cfg.PxPerSp { if cfg := *e.Config; cfg != e.oldCfg {
e.invalidate() e.invalidate()
e.oldCfg = cfg
} }
e.cfg = c
sbounds := e.scrollBounds() sbounds := e.scrollBounds()
var smin, smax int var smin, smax int
var axis gesture.Axis var axis gesture.Axis
@@ -80,7 +81,7 @@ func (e *Editor) Update(c *ui.Config, q input.Events) []EditorEvent {
axis = gesture.Vertical axis = gesture.Vertical
smin, smax = sbounds.Min.Y, sbounds.Max.Y smin, smax = sbounds.Min.Y, sbounds.Max.Y
} }
sdist := e.scroller.Update(c, q, axis) sdist := e.scroller.Update(e.Config, q, axis)
var soff int var soff int
if e.SingleLine { if e.SingleLine {
e.scrollOff.X += sdist e.scrollOff.X += sdist
@@ -95,7 +96,7 @@ func (e *Editor) Update(c *ui.Config, q input.Events) []EditorEvent {
case evt.Type == gesture.TypePress && evt.Source == pointer.Mouse, case evt.Type == gesture.TypePress && evt.Source == pointer.Mouse,
evt.Type == gesture.TypeClick && evt.Source == pointer.Touch: evt.Type == gesture.TypeClick && evt.Source == pointer.Touch:
scrollTo = true scrollTo = true
e.blinkStart = c.Now e.blinkStart = e.Config.Now
e.moveCoord(image.Point{ e.moveCoord(image.Point{
X: int(math.Round(float64(evt.Position.X))), X: int(math.Round(float64(evt.Position.X))),
Y: int(math.Round(float64(evt.Position.Y))), Y: int(math.Round(float64(evt.Position.Y))),
@@ -106,7 +107,7 @@ func (e *Editor) Update(c *ui.Config, q input.Events) []EditorEvent {
stop := (sdist > 0 && soff >= smax) || (sdist < 0 && soff <= smin) stop := (sdist > 0 && soff >= smax) || (sdist < 0 && soff <= smin)
var events []EditorEvent var events []EditorEvent
for _, ke := range q.For(e) { for _, ke := range q.For(e) {
e.blinkStart = c.Now e.blinkStart = e.Config.Now
switch ke := ke.(type) { switch ke := ke.(type) {
case key.Focus: case key.Focus:
e.focused = ke.Focus e.focused = ke.Focus
@@ -141,12 +142,12 @@ func (e *Editor) Update(c *ui.Config, q input.Events) []EditorEvent {
} }
func (e *Editor) caretWidth() fixed.Int26_6 { func (e *Editor) caretWidth() fixed.Int26_6 {
oneDp := int(e.cfg.Val(ui.Dp(1)) + .5) oneDp := int(e.Config.Val(ui.Dp(1)) + .5)
return fixed.Int26_6(oneDp * 64) return fixed.Int26_6(oneDp * 64)
} }
func (e *Editor) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens { func (e *Editor) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
twoDp := int(e.cfg.Val(ui.Dp(2)) + 0.5) twoDp := int(e.Config.Val(ui.Dp(2)) + 0.5)
e.padLeft, e.padRight = twoDp, twoDp e.padLeft, e.padRight = twoDp, twoDp
maxWidth := cs.Width.Max maxWidth := cs.Width.Max
if e.SingleLine { if e.SingleLine {
@@ -195,7 +196,7 @@ func (e *Editor) Layout(ops *ui.Ops, cs layout.Constraints) layout.Dimens {
ui.OpPop{}.Add(ops) ui.OpPop{}.Add(ops)
} }
if e.focused { if e.focused {
now := e.cfg.Now now := e.Config.Now
dt := now.Sub(e.blinkStart) dt := now.Sub(e.blinkStart)
blinking := dt < maxBlinkDuration blinking := dt < maxBlinkDuration
const timePerBlink = time.Second / blinksPerSecond const timePerBlink = time.Second / blinksPerSecond