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

op: add package op for operations

Browse Source 
Extract operation types from package ui into package op.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2019-09-30 15:41:15 +02:00
parent eba1b3a95f
commit 8cf35a1f97
27 changed files with 225 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/pointer/doc.go
+3 -3
View File
@@ -15,7 +15,7 @@ subsequent InputOp are active.
For example, to set up a rectangular hit area:
var ops ui.Ops
var ops op.Ops
var h *Handler = ...
r := image.Rectangle{...}
@@ -33,8 +33,8 @@ with the most recent node.
For example:
ops := new(ui.Ops)
var stack ui.StackOp
ops := new(op.Ops)
var stack op.StackOp
var h1, h2 *Handler
stack.Push(ops)
io/pointer/pointer.go
+7 -7
View File
@@ -10,7 +10,7 @@ import (
"gioui.org/f32"
"gioui.org/internal/opconst"
"gioui.org/io/event"
"gioui.org/ui"
"gioui.org/op"
)
// Event is a pointer event.
@@ -33,7 +33,7 @@ type Event struct {
// outside it.
Hit bool
// Position is the position of the event, relative to
// the current transformation, as set by ui.TransformOp.
// the current transformation, as set by op.TransformOp.
Position f32.Point
// Scroll is the scroll amount, if any.
Scroll f32.Point
@@ -124,21 +124,21 @@ const (
areaEllipse
)
func (op RectAreaOp) Add(ops *ui.Ops) {
func (op RectAreaOp) Add(ops *op.Ops) {
areaOp{
kind: areaRect,
rect: op.Rect,
}.add(ops)
}
func (op EllipseAreaOp) Add(ops *ui.Ops) {
func (op EllipseAreaOp) Add(ops *op.Ops) {
areaOp{
kind: areaEllipse,
rect: op.Rect,
}.add(ops)
}
func (op areaOp) add(o *ui.Ops) {
func (op areaOp) add(o *op.Ops) {
data := make([]byte, opconst.TypeAreaLen)
data[0] = byte(opconst.TypeArea)
data[1] = byte(op.kind)
@@ -150,7 +150,7 @@ func (op areaOp) add(o *ui.Ops) {
o.Write(data)
}
func (h InputOp) Add(o *ui.Ops) {
func (h InputOp) Add(o *op.Ops) {
data := make([]byte, opconst.TypePointerInputLen)
data[0] = byte(opconst.TypePointerInput)
if h.Grab {
@@ -159,7 +159,7 @@ func (h InputOp) Add(o *ui.Ops) {
o.Write(data, h.Key)
}
func (op PassOp) Add(o *ui.Ops) {
func (op PassOp) Add(o *op.Ops) {
data := make([]byte, opconst.TypePassLen)
data[0] = byte(opconst.TypePass)
if op.Pass {