diff options
| author | Mike Reed <reed@google.com> | 2018-10-30 12:53:21 -0400 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-10-30 17:26:47 +0000 |
| commit | 3a42ec0ee7937d88bb087b98c1b536fb7cbd77c6 (patch) | |
| tree | 66c3bb4ac4b9657874042b95040268e54d2ab990 /modules | |
| parent | f5973509ec681e3cc6d498dc31e549c6285e4a61 (diff) | |
| download | skqp-3a42ec0ee7937d88bb087b98c1b536fb7cbd77c6.tar.gz | |
hide the SkPaint::Align enum entirely
Bug: skia:2664
Change-Id: I080b015dbcb3a3cd73bb6847f3243a996d5f7b7d
Reviewed-on: https://skia-review.googlesource.com/c/166282
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/skottie/src/SkottieValue.cpp | 8 | ||||
| -rw-r--r-- | modules/skottie/src/SkottieValue.h | 3 | ||||
| -rw-r--r-- | modules/sksg/include/SkSGText.h | 5 | ||||
| -rw-r--r-- | modules/sksg/src/SkSGText.cpp | 6 |
4 files changed, 12 insertions, 10 deletions
diff --git a/modules/skottie/src/SkottieValue.cpp b/modules/skottie/src/SkottieValue.cpp index dd37a53a5e..7e80377f90 100644 --- a/modules/skottie/src/SkottieValue.cpp +++ b/modules/skottie/src/SkottieValue.cpp @@ -263,10 +263,10 @@ bool ValueTraits<TextValue>::FromJSON(const skjson::Value& jv, v->fText.set(text->begin(), text->size()); v->fTextSize = **text_size; - static constexpr SkPaint::Align gAlignMap[] = { - SkPaint::kLeft_Align, // 'j': 0 - SkPaint::kRight_Align, // 'j': 1 - SkPaint::kCenter_Align // 'j': 2 + static constexpr SkTextUtils::Align gAlignMap[] = { + SkTextUtils::kLeft_Align, // 'j': 0 + SkTextUtils::kRight_Align, // 'j': 1 + SkTextUtils::kCenter_Align // 'j': 2 }; v->fAlign = gAlignMap[SkTMin<size_t>(ParseDefault<size_t>((*jtxt)["j"], 0), SK_ARRAY_COUNT(gAlignMap))]; diff --git a/modules/skottie/src/SkottieValue.h b/modules/skottie/src/SkottieValue.h index cb9dac840f..1c145688ba 100644 --- a/modules/skottie/src/SkottieValue.h +++ b/modules/skottie/src/SkottieValue.h @@ -13,6 +13,7 @@ #include "SkPath.h" #include "SkScalar.h" #include "SkString.h" +#include "SkTextUtils.h" #include "SkTypeface.h" #include <vector> @@ -74,7 +75,7 @@ struct TextValue { SkString fText; float fTextSize = 0, fStrokeWidth = 0; - SkPaint::Align fAlign = SkPaint::kLeft_Align; + SkTextUtils::Align fAlign = SkTextUtils::kLeft_Align; SkColor fFillColor = SK_ColorTRANSPARENT, fStrokeColor = SK_ColorTRANSPARENT; bool fHasFill : 1, diff --git a/modules/sksg/include/SkSGText.h b/modules/sksg/include/SkSGText.h index c1f3ee1d2d..09683e9c3b 100644 --- a/modules/sksg/include/SkSGText.h +++ b/modules/sksg/include/SkSGText.h @@ -13,6 +13,7 @@ #include "SkPaintDefaults.h" #include "SkPoint.h" #include "SkString.h" +#include "SkTextUtils.h" class SkCanvas; class SkPaint; @@ -36,7 +37,7 @@ public: SG_ATTRIBUTE(Size , SkScalar , fSize ) SG_ATTRIBUTE(ScaleX , SkScalar , fScaleX ) SG_ATTRIBUTE(SkewX , SkScalar , fSkewX ) - SG_ATTRIBUTE(Align , SkPaint::Align , fAlign ) + SG_ATTRIBUTE(Align , SkTextUtils::Align , fAlign ) SG_ATTRIBUTE(Hinting , SkPaint::Hinting , fHinting ) // TODO: add shaping functionality. @@ -60,7 +61,7 @@ private: SkScalar fSize = SkPaintDefaults_TextSize; SkScalar fScaleX = 1; SkScalar fSkewX = 0; - SkPaint::Align fAlign = SkPaint::kLeft_Align; + SkTextUtils::Align fAlign = SkTextUtils::kLeft_Align; SkPaint::Hinting fHinting = SkPaintDefaults_Hinting; sk_sp<SkTextBlob> fBlob; // cached text blob diff --git a/modules/sksg/src/SkSGText.cpp b/modules/sksg/src/SkSGText.cpp index 1451c38e47..f63fcf035d 100644 --- a/modules/sksg/src/SkSGText.cpp +++ b/modules/sksg/src/SkSGText.cpp @@ -30,12 +30,12 @@ SkPoint Text::alignedPosition(SkScalar advance) const { auto aligned = fPosition; switch (fAlign) { - case SkPaint::kLeft_Align: + case SkTextUtils::kLeft_Align: break; - case SkPaint::kCenter_Align: + case SkTextUtils::kCenter_Align: aligned.offset(-advance / 2, 0); break; - case SkPaint::kRight_Align: + case SkTextUtils::kRight_Align: aligned.offset(-advance, 0); break; } |