diff --git a/ui/pointer/pointer.go b/ui/pointer/pointer.go index 9d437fa9..f0988f74 100644 --- a/ui/pointer/pointer.go +++ b/ui/pointer/pointer.go @@ -41,12 +41,12 @@ type Events interface { For(k Key) []Event } -type HitResult uint8 +type hitResult uint8 const ( - HitNone HitResult = iota - HitTransparent - HitOpaque + hitNone hitResult = iota + hitTransparent + hitOpaque ) type ID uint16 @@ -118,10 +118,10 @@ func (op *OpArea) decode(d []byte) { } } -func (op *OpArea) hit(pos f32.Point) HitResult { - res := HitOpaque +func (op *OpArea) hit(pos f32.Point) hitResult { + res := hitOpaque if op.Transparent { - res = HitTransparent + res = hitTransparent } switch op.kind { case areaRect: @@ -129,7 +129,7 @@ func (op *OpArea) hit(pos f32.Point) HitResult { 0 <= pos.Y && pos.Y < float32(op.size.Y) { return res } else { - return HitNone + return hitNone } case areaEllipse: rx := float32(op.size.X) / 2 @@ -141,7 +141,7 @@ func (op *OpArea) hit(pos f32.Point) HitResult { if xh*xh*ry2+yk*yk*rx2 <= rx2*ry2 { return res } else { - return HitNone + return hitNone } default: panic("invalid area kind") diff --git a/ui/pointer/queue.go b/ui/pointer/queue.go index 74b286d1..79895487 100644 --- a/ui/pointer/queue.go +++ b/ui/pointer/queue.go @@ -110,8 +110,8 @@ func (q *Queue) opHit(handlers *[]Key, pos f32.Point) { continue } res := h.area.hit(pos) - opaque = opaque || res == HitOpaque - if res != HitNone { + 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,12 +256,12 @@ func (q *Queue) Push(e Event) { } } -func (a areaIntersection) hit(p f32.Point) HitResult { - res := HitNone +func (a areaIntersection) hit(p f32.Point) hitResult { + res := hitNone for _, area := range a { tp := area.trans.InvTransform(p) res = area.area.hit(tp) - if res == HitNone { + if res == hitNone { break } }