add caps option 'k' to FatBits

samplecode/SampleFatBits.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SampleCode.h"
 #include "SkView.h"
@@ skipping 29 matching lines @@
 public:
     FatBits() {
         fAA = false;
         fStyle = kHair_Style;
         fGrid = false;
         fShowSkeleton = true;
         fUseGPU = false;
         fUseClip = false;
         fRectAsOval = false;
         fUseTriangle = false;
+        fStrokeCap = SkPaint::kButt_Cap;
 
         fClipRect.set(2, 2, 11, 8 );
     }
 
     int getZoom() const { return fZoom; }
 
     bool getAA() const { return fAA; }
     void setAA(bool aa) { fAA = aa; }
 
     bool getGrid() const { return fGrid; }
@@ skipping 35 matching lines @@
         info = info.makeWH(width * zoom, height * zoom);
         fMaxSurface.reset(SkSurface::NewRaster(info));
     }
 
     void drawBG(SkCanvas*);
     void drawFG(SkCanvas*);
     void drawLine(SkCanvas*, SkPoint pts[2]);
     void drawRect(SkCanvas* canvas, SkPoint pts[2]);
     void drawTriangle(SkCanvas* canvas, SkPoint pts[3]);
 
+    SkPaint::Cap fStrokeCap;
+
 private:
     bool fAA, fGrid, fShowSkeleton, fUseGPU, fUseClip, fRectAsOval, fUseTriangle;
     Style fStyle;
     int fW, fH, fZoom;
     SkMatrix fMatrix, fInverse;
     SkRect   fBounds, fClipRect;
     SkAutoTUnref<SkShader> fShader;
     SkAutoTUnref<SkSurface> fMinSurface;
     SkAutoTUnref<SkSurface> fMaxSurface;
 
     void setupPaint(SkPaint* paint) {
         bool aa = this->getAA();
+        paint->setStrokeCap(fStrokeCap);
         switch (fStyle) {
             case kHair_Style:
                 paint->setStrokeWidth(0);
                 break;
             case kStroke_Style:
                 paint->setStrokeWidth(SK_Scalar1);
                 break;
         }
         paint->setAntiAlias(aa);
     }
@@ skipping 112 matching lines @@
                 p.setStrokeWidth(SK_Scalar1 * fZoom);
                 SkPath dst;
                 p.getFillPath(path, &dst);
                 path.addPath(dst);
             }
             break;
         case kStroke_Style: {
             SkPaint p;
             p.setStyle(SkPaint::kStroke_Style);
             p.setStrokeWidth(SK_Scalar1 * fZoom);
+            p.setStrokeCap(fStrokeCap);
             SkPath dst;
             p.getFillPath(path, &dst);
             path = dst;
 
+            path.moveTo(pts[0]);
+            path.lineTo(pts[1]);
+
             if (fUseGPU) {
                 path.moveTo(dst.getPoint(0));
                 path.lineTo(dst.getPoint(2));
             }
         } break;
     }
     max->drawPath(path, paint);
 }
 
 void FatBits::drawLine(SkCanvas* canvas, SkPoint pts[]) {
@@ skipping 160 matching lines @@
                     fFB.setGrid(!fFB.getGrid());
                     this->inval(nullptr);
                     return true;
                 case 's':
                     if (FatBits::kStroke_Style == fFB.getStyle()) {
                         this->setStyle(FatBits::kHair_Style);
                     } else {
                         this->setStyle(FatBits::kStroke_Style);
                     }
                     return true;
+                case 'k': {
+                    const SkPaint::Cap caps[] = {
+                        SkPaint::kButt_Cap, SkPaint::kRound_Cap, SkPaint::kSquare_Cap,
+                    };
+                    fFB.fStrokeCap = caps[(fFB.fStrokeCap + 1) % 3];
+                    this->inval(nullptr);
+                    return true;
+                } break;
                 case 'a':
                     fFB.setAA(!fFB.getAA());
                     this->inval(nullptr);
                     return true;
                 case 'w':
                     fFB.setShowSkeleton(!fFB.getShowSkeleton());
                     this->inval(nullptr);
                     return true;
                 case 'g':
                     fFB.setUseGPU(!fFB.getUseGPU());
@@ skipping 67 matching lines @@
 
 private:
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DrawLineView; }
 static SkViewRegister reg(MyFactory);