io/input,io/key: [API] replace SelectionOp with command

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2023-10-09 17:04:22 -05:00
parent 627e028d3c
commit 813d836641
5 changed files with 29 additions and 54 deletions
+8 -20
View File
@@ -11,7 +11,6 @@ package key
import (
"encoding/binary"
"math"
"strings"
"gioui.org/f32"
@@ -39,6 +38,13 @@ type SoftKeyboardCmd struct {
Show bool
}
// SelectionCmd updates the selection for an input handler.
type SelectionCmd struct {
Tag event.Tag
Range
Caret
}
// Set is an expression that describes a set of key combinations, in the form
// "<modifiers>-<keyset>|...". Modifiers are separated by dashes, optional
// modifiers are enclosed by parentheses. A key set is either a literal key
@@ -55,13 +61,6 @@ type SoftKeyboardCmd struct {
// - Shift-(Ctrl)-A matches A if shift is pressed, and optionally ctrl.
type Set string
// SelectionOp updates the selection for an input handler.
type SelectionOp struct {
Tag event.Tag
Range
Caret
}
// SnippetOp updates the content snippet for an input handler.
type SnippetOp struct {
Tag event.Tag
@@ -344,18 +343,6 @@ func (s SnippetOp) Add(o *op.Ops) {
bo.PutUint32(data[5:], uint32(s.Range.End))
}
func (s SelectionOp) Add(o *op.Ops) {
data := ops.Write1(&o.Internal, ops.TypeSelectionLen, s.Tag)
data[0] = byte(ops.TypeSelection)
bo := binary.LittleEndian
bo.PutUint32(data[1:], uint32(s.Start))
bo.PutUint32(data[5:], uint32(s.End))
bo.PutUint32(data[9:], math.Float32bits(s.Pos.X))
bo.PutUint32(data[13:], math.Float32bits(s.Pos.Y))
bo.PutUint32(data[17:], math.Float32bits(s.Ascent))
bo.PutUint32(data[21:], math.Float32bits(s.Descent))
}
func (EditEvent) ImplementsEvent() {}
func (Event) ImplementsEvent() {}
func (FocusEvent) ImplementsEvent() {}
@@ -364,6 +351,7 @@ func (SelectionEvent) ImplementsEvent() {}
func (FocusCmd) ImplementsCommand() {}
func (SoftKeyboardCmd) ImplementsCommand() {}
func (SelectionCmd) ImplementsCommand() {}
func (m Modifiers) String() string {
var strs []string