commit 147476da9eb1577dbdf058edc1164b661347f48d
author reed <reed@google.com> Wed Aug 06 07:00:27 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 06 07:00:27 2014 -0700
tree 4eafa10ddc23d1b84fb81b868fb94cc56f5f4a1e
parent 1b27704eba15be4e9d1997faac42038493a30be5

fix hittest in Patch sample

TBR=
BUG=skia:

Author: reed@google.com

Review URL: https://codereview.chromium.org/441373002

samplecode/SamplePatch.cpp

diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index fe94bbf..d3ae71a 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -218,6 +218,9 @@
     patch->draw(canvas, paint, 10, 10, true, true);
 }
 
+const SkScalar DX = 20;
+const SkScalar DY = 0;
+
 class PatchView : public SampleView {
     SkShader*   fShader0;
     SkShader*   fShader1;
@@ -271,7 +274,7 @@
         paint.setDither(true);
         paint.setFilterLevel(SkPaint::kLow_FilterLevel);
 
-        canvas->translate(SkIntToScalar(20), 0);
+        canvas->translate(DX, DY);
 
         Patch   patch;
 
@@ -327,6 +330,8 @@
 
     virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
                                               unsigned modi) SK_OVERRIDE {
+        x -= DX;
+        y -= DY;
         for (size_t i = 0; i < SK_ARRAY_COUNT(fPts); i++) {
             if (hittest(fPts[i], x, y)) {
                 return new PtClick(this, (int)i);
@@ -336,7 +341,7 @@
     }
 
     virtual bool onClick(Click* click) {
-        fPts[((PtClick*)click)->fIndex].set(click->fCurr.fX, click->fCurr.fY);
+        fPts[((PtClick*)click)->fIndex].set(click->fCurr.fX - DX, click->fCurr.fY - DY);
         this->inval(NULL);
         return true;
     }