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

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

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-06-21 15:35:45 +02:00
parent dda9e3486d
commit 98d4d926f6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/text/editor.go
+5 -4
View File
@@ -21,6 +21,7 @@ import (
type Editor struct { type Editor struct {
Config *ui.Config Config *ui.Config
Inputs input.Events
Face Face Face Face
Alignment Alignment Alignment Alignment
SingleLine bool SingleLine bool
@@ -66,7 +67,7 @@ const (
func (s Submission) isEditorEvent() {} func (s Submission) isEditorEvent() {}
func (e *Editor) Update(q input.Events) []EditorEvent { func (e *Editor) Update() []EditorEvent {
if cfg := *e.Config; cfg != e.oldCfg { if cfg := *e.Config; cfg != e.oldCfg {
e.invalidate() e.invalidate()
e.oldCfg = cfg e.oldCfg = cfg
@@ -81,7 +82,7 @@ func (e *Editor) Update(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(e.Config, q, axis) sdist := e.scroller.Update(e.Config, e.Inputs, axis)
var soff int var soff int
if e.SingleLine { if e.SingleLine {
e.scrollOff.X += sdist e.scrollOff.X += sdist
@@ -91,7 +92,7 @@ func (e *Editor) Update(q input.Events) []EditorEvent {
soff = e.scrollOff.Y soff = e.scrollOff.Y
} }
scrollTo := false scrollTo := false
for _, evt := range e.clicker.Update(q) { for _, evt := range e.clicker.Update(e.Inputs) {
switch { switch {
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:
@@ -106,7 +107,7 @@ func (e *Editor) Update(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 e.Inputs.For(e) {
e.blinkStart = e.Config.Now e.blinkStart = e.Config.Now
switch ke := ke.(type) { switch ke := ke.(type) {
case key.Focus: case key.Focus: