diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-29 13:03:00 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-02-29 13:03:00 +0000 |
| commit | aefdd062717dd6182e0f87d727c807af4314d445 (patch) | |
| tree | 31a12c9f3de4094760cbb95a3b0a8cae94b9c9d2 /src/core/SkPaint.cpp | |
| parent | 893ff3053f7fca556deccae120b987f5c0bbcb74 (diff) | |
move SKPaint's defaults (that might be configurable) into a header
git-svn-id: http://skia.googlecode.com/svn/trunk@3280 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPaint.cpp')
| -rw-r--r-- | src/core/SkPaint.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 0578f3cffa..52d771e8e3 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -23,15 +23,12 @@ #include "SkXfermode.h" #include "SkAutoKern.h" #include "SkGlyphCache.h" +#include "SkPaintDefaults.h" // define this to get a printf for out-of-range parameter in setters // e.g. setTextSize(-1) //#define SK_REPORT_API_RANGE_CHECK -#define SK_DefaultTextSize SkIntToScalar(12) - -#define SK_DefaultFlags 0 //(kNativeHintsText_Flag) - #ifdef SK_BUILD_FOR_ANDROID #define GEN_ID_INC fGenerationID++ #define GEN_ID_INC_EVAL(expression) if (expression) { fGenerationID++; } @@ -60,17 +57,17 @@ SkPaint::SkPaint() { fWidth = 0; #endif - fTextSize = SK_DefaultTextSize; + fTextSize = SkPaintDefaults_TextSize; fTextScaleX = SK_Scalar1; fColor = SK_ColorBLACK; - fMiterLimit = SK_DefaultMiterLimit; - fFlags = SK_DefaultFlags; + fMiterLimit = SkPaintDefaults_MiterLimit; + fFlags = SkPaintDefaults_Flags; fCapType = kDefault_Cap; fJoinType = kDefault_Join; fTextAlign = kLeft_Align; fStyle = kFill_Style; fTextEncoding = kUTF8_TextEncoding; - fHinting = kNormal_Hinting; + fHinting = SkPaintDefaults_Hinting; #ifdef SK_BUILD_FOR_ANDROID fGenerationID = 0; #endif |