commit 5fd9243fd6b82aa3f2a2fae7c62310e77ab7b6d3
author mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 01:59:48 2011 +0000
committer mike@reedtribe.org <mike@reedtribe.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 01:59:48 2011 +0000
tree f24879abbfb8ee487aba55d4da42b6f08a6b1c67
parent f871268f560915d523f492cd6d2a2c6146d17d6f

switch to inheriting from SampleView



git-svn-id: http://skia.googlecode.com/svn/trunk@1249 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleCircle.cpp

diff --git a/samplecode/SampleCircle.cpp b/samplecode/SampleCircle.cpp
index 1f9957d..2abc28d 100644
--- a/samplecode/SampleCircle.cpp
+++ b/samplecode/SampleCircle.cpp
@@ -17,7 +17,7 @@
 #endif
 }
 
-class CircleView : public SkView {
+class CircleView : public SampleView {
 public:
     static const SkScalar ANIM_DX;
     static const SkScalar ANIM_DY;
@@ -39,10 +39,6 @@
         return this->INHERITED::onQuery(evt);
     }
     
-    void drawBG(SkCanvas* canvas) {
-        canvas->drawColor(SK_ColorWHITE);
-    }
-    
     void circle(SkCanvas* canvas, int width, bool aa) {
         SkPaint paint;
         
@@ -95,9 +91,7 @@
         canvas->translate(px, py);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
-        this->drawBG(canvas);
-
+    virtual void onDrawContent(SkCanvas* canvas) {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStyle(SkPaint::kStroke_Style);
@@ -114,34 +108,11 @@
             canvas->translate(-SK_Scalar1, 0);
             canvas->drawPath(path, paint);
         }
-        
-        if (false) {
-            test_circlebounds(canvas);
-            
-            SkScalar dx = SkIntToScalar(32);
-            SkScalar dy = SkIntToScalar(32);
-            
-            canvas->translate(dx + fDX, dy + fDY);
-            drawSix(canvas, dx, dy);
-
-            canvas->translate(dx, 0);
-            canvas->translate(SK_ScalarHalf, SK_ScalarHalf);
-            drawSix(canvas, dx, dy);
-        
-            fDX += ANIM_DX;
-            fDY += ANIM_DY;
-            fRAD += ANIM_RAD;
-            fN += 1;
-            if (fN > 40) {
-                fN = 3;
-            }
-            this->inval(NULL);
-        }
     }
     
 private:
     int fN;
-    typedef SkView INHERITED;
+    typedef SampleView INHERITED;
 };
 
 const SkScalar CircleView::ANIM_DX(SK_Scalar1 / 67);