commit eb420457fd80f1b449b1ba94d5fb740f6aa3103f
author Florin Malita <fmalita@chromium.org> Tue Feb 20 11:44:43 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 20 17:57:53 2018 +0000
tree 3fd5dbee296fda65f2a7bc1352b168eb8cce1a0b
parent 535ba8d2b862a364f7f8009d6e79cd41519f5643

Add SkRect::contains(SkScalar x, SkScalar y)

Similar to its SkIRect counterpart.

Change-Id: I6872694d8602ed4181a1a15b4cd1c2c32aeab3f9
Reviewed-on: https://skia-review.googlesource.com/108506
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>

tools/viewer/SlideDir.cpp

diff --git a/tools/viewer/SlideDir.cpp b/tools/viewer/SlideDir.cpp
index ce036b4..da8685d 100644
--- a/tools/viewer/SlideDir.cpp
+++ b/tools/viewer/SlideDir.cpp
@@ -153,8 +153,7 @@
     bool onMouse(SkScalar x, SkScalar y, sk_app::Window::InputState state, uint32_t modifiers) {
         SkASSERT(fTarget);
 
-        // TODO: no SkRect::contains(SkPoint) ?!
-        if (x < fRect.fLeft || x > fRect.fRight || y < fRect.fTop || y > fRect.fBottom) {
+        if (!fRect.contains(x, y)) {
             this->startUnfocus();
             return true;
         }