From b12430bab392f17b03aaa63c1bc0cc864b0c8cf1 Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Wed, 5 Jun 2019 10:46:23 +0200 Subject: [PATCH] ui/pointer: unexport OpArea.Hit Signed-off-by: Elias Naur --- ui/pointer/pointer.go | 2 +- ui/pointer/queue.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/pointer/pointer.go b/ui/pointer/pointer.go index 653f3b4b..06adaba3 100644 --- a/ui/pointer/pointer.go +++ b/ui/pointer/pointer.go @@ -116,7 +116,7 @@ func (op *OpArea) decode(d []byte) { } } -func (op *OpArea) Hit(pos f32.Point) HitResult { +func (op *OpArea) hit(pos f32.Point) HitResult { switch op.kind { case areaRect: if 0 <= pos.X && pos.X < float32(op.size.X) && diff --git a/ui/pointer/queue.go b/ui/pointer/queue.go index 6d0311e0..74b286d1 100644 --- a/ui/pointer/queue.go +++ b/ui/pointer/queue.go @@ -109,7 +109,7 @@ func (q *Queue) opHit(handlers *[]Key, pos f32.Point) { if !ok { continue } - res := h.area.Hit(pos) + res := h.area.hit(pos) opaque = opaque || res == HitOpaque if res != HitNone { *handlers = append(*handlers, n.key) @@ -238,7 +238,7 @@ func (q *Queue) Push(e Event) { case i == 0: e.Priority = Foremost } - e.Hit = h.area.Hit(e.Position) != HitNone + e.Hit = h.area.hit(e.Position) != HitNone e.Position = h.transform.InvTransform(e.Position) h.events = append(h.events, e) if e.Type == Release { @@ -256,11 +256,11 @@ func (q *Queue) Push(e Event) { } } -func (a areaIntersection) Hit(p f32.Point) HitResult { +func (a areaIntersection) hit(p f32.Point) HitResult { res := HitNone for _, area := range a { tp := area.trans.InvTransform(p) - res = area.area.Hit(tp) + res = area.area.hit(tp) if res == HitNone { break }