fix hittest in Patch sample

samplecode/SamplePatch.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 200 matching lines @@
 
     patch->draw(canvas, paint, 10, 10, false, false);
     canvas->translate(SkIntToScalar(180), 0);
     patch->draw(canvas, paint, 10, 10, true, false);
     canvas->translate(SkIntToScalar(180), 0);
     patch->draw(canvas, paint, 10, 10, false, true);
     canvas->translate(SkIntToScalar(180), 0);
     patch->draw(canvas, paint, 10, 10, true, true);
 }
 
+const SkScalar DX = 20;
+const SkScalar DY = 0;
+
 class PatchView : public SampleView {
     SkShader*   fShader0;
     SkShader*   fShader1;
     SkIPoint    fSize0, fSize1;
     SkPoint     fPts[12];
 
 public:
     PatchView() {
         fShader0 = make_shader0(&fSize0);
         fSize1 = fSize0;
@@ skipping 33 matching lines @@
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
         SkPaint paint;
         paint.setDither(true);
         paint.setFilterLevel(SkPaint::kLow_FilterLevel);
 
-        canvas->translate(SkIntToScalar(20), 0);
+        canvas->translate(DX, DY);
 
         Patch   patch;
 
         paint.setShader(fShader0);
         if (fSize0.fX == 0) {
             fSize0.fX = 1;
         }
         if (fSize0.fY == 0) {
             fSize0.fY = 1;
         }
@@ skipping 35 matching lines @@
         int fIndex;
         PtClick(SkView* view, int index) : Click(view), fIndex(index) {}
     };
 
     static bool hittest(const SkPoint& pt, SkScalar x, SkScalar y) {
         return SkPoint::Length(pt.fX - x, pt.fY - y) < SkIntToScalar(5);
     }
 
     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);
             }
         }
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
     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;
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new PatchView; }
 static SkViewRegister reg(MyFactory);