From a046f15156d11c0ce82c9c9e8a8f9ae3c425393a Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Mon, 11 May 2020 11:57:37 +0200 Subject: [PATCH] io/router: return boolean expressions directly Signed-off-by: Elias Naur --- io/router/pointer.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/io/router/pointer.go b/io/router/pointer.go index 0c215357..3eb95f93 100644 --- a/io/router/pointer.go +++ b/io/router/pointer.go @@ -330,12 +330,8 @@ func (op *areaOp) Hit(pos f32.Point) bool { size := op.rect.Size() switch op.kind { case areaRect: - if 0 <= pos.X && pos.X < float32(size.X) && - 0 <= pos.Y && pos.Y < float32(size.Y) { - return true - } else { - return false - } + return 0 <= pos.X && pos.X < float32(size.X) && + 0 <= pos.Y && pos.Y < float32(size.Y) case areaEllipse: rx := float32(size.X) / 2 ry := float32(size.Y) / 2 @@ -343,11 +339,7 @@ func (op *areaOp) Hit(pos f32.Point) bool { ry2 := ry * ry xh := pos.X - rx yk := pos.Y - ry - if xh*xh*ry2+yk*yk*rx2 <= rx2*ry2 { - return true - } else { - return false - } + return xh*xh*ry2+yk*yk*rx2 <= rx2*ry2 default: panic("invalid area kind") }