commit 961ddb04a0a7aba843032d829ab867518e52559e
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 14:03:48 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu May 05 14:03:48 2011 +0000
tree acab8fac9ac1f56650b3b2ef9ab7aff5384466ed
parent 2ba4abbb3171e058b7f9b1d7c7954ee6989a21e6

update to SampleView



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

samplecode/SampleDither.cpp

diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index 1199fa4..3e77a5d 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.cpp
@@ -62,8 +62,7 @@
     }
 }
 
-static void make_bm(SkBitmap* bm)
-{
+static void make_bm(SkBitmap* bm) {
     bm->setConfig(SkBitmap::kARGB_8888_Config, 100, 100);
     bm->allocPixels();
 #if 0
@@ -109,7 +108,7 @@
     }
 }
 
-class DitherView : public SkView {
+class DitherView : public SampleView {
 public:
     SkBitmap    fBM, fBMPreDither, fBM16;
     SkScalar fAngle;
@@ -121,6 +120,8 @@
         fBM.copyTo(&fBM16, SkBitmap::kARGB_4444_Config);
         
         fAngle = 0;
+        
+        this->setBGColor(0xFF181818);
     }
 
 protected:
@@ -133,14 +134,7 @@
         return this->INHERITED::onQuery(evt);
     }
     
-    void drawBG(SkCanvas* canvas) {
-//        canvas->drawColor(0xFFDDDDDD);
-        canvas->drawColor(0xFF181818);
-    }
-    
-    virtual void onDraw(SkCanvas* canvas) {
-        this->drawBG(canvas);
-
+    virtual void onDrawContent(SkCanvas* canvas) {
         SkPaint paint;
         SkScalar x = SkIntToScalar(10);
         SkScalar y = SkIntToScalar(10);
@@ -173,20 +167,8 @@
         this->inval(NULL);
     }
 
-    virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) 
-    {
-     //   fSweep += SK_Scalar1;
-        this->inval(NULL);
-        return this->INHERITED::onFindClickHandler(x, y);
-    }
-    
-    virtual bool onClick(Click* click) 
-    {
-        return this->INHERITED::onClick(click);
-    }
-    
 private:
-    typedef SkView INHERITED;
+    typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////