diff options
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/ClockFaceView.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleAll.cpp | 3 | ||||
-rw-r--r-- | samplecode/SampleFontScalerTest.cpp | 40 | ||||
-rw-r--r-- | samplecode/SampleSlides.cpp | 3 |
4 files changed, 23 insertions, 26 deletions
diff --git a/samplecode/ClockFaceView.cpp b/samplecode/ClockFaceView.cpp index f4d2324676..8de2f9339d 100644 --- a/samplecode/ClockFaceView.cpp +++ b/samplecode/ClockFaceView.cpp @@ -187,8 +187,7 @@ protected: paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(240)); - paint.setTypeface(SkTypeface::MakeFromName("sans-serif", - SkFontStyle::FromOldStyle(SkTypeface::kBold))); + paint.setTypeface(SkTypeface::MakeFromName("sans-serif", SkFontStyle::Bold())); SkString str("9"); diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index f7a5a3a7b1..f3d1083cb1 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -487,8 +487,7 @@ protected: paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(48)); - paint.setTypeface(SkTypeface::MakeFromName("sans-serif", - SkFontStyle::FromOldStyle(SkTypeface::kBold))); + paint.setTypeface(SkTypeface::MakeFromName("sans-serif", SkFontStyle::Bold())); SkString str("GOOGLE"); diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp index 2b4a46d00c..b41166d38e 100644 --- a/samplecode/SampleFontScalerTest.cpp +++ b/samplecode/SampleFontScalerTest.cpp @@ -5,32 +5,33 @@ * found in the LICENSE file. */ #include "SampleCode.h" -#include "SkView.h" +#include "Sk1DPathEffect.h" #include "SkCanvas.h" -#include "SkTypeface.h" +#include "SkColorFilter.h" +#include "SkColorPriv.h" +#include "SkCornerPathEffect.h" +#include "SkDither.h" +#include "SkFontStyle.h" #include "SkPath.h" +#include "SkPathMeasure.h" +#include "SkRandom.h" #include "SkRegion.h" #include "SkShader.h" +#include "SkTypeface.h" #include "SkUtils.h" -#include "Sk1DPathEffect.h" -#include "SkCornerPathEffect.h" -#include "SkPathMeasure.h" -#include "SkRandom.h" -#include "SkColorPriv.h" -#include "SkColorFilter.h" -#include "SkDither.h" +#include "SkView.h" -static const struct { +static constexpr struct { const char* fName; - SkTypeface::Style fStyle; + SkFontStyle fStyle; } gFaces[] = { - { nullptr, SkTypeface::kNormal }, - { nullptr, SkTypeface::kBold }, - { "serif", SkTypeface::kNormal }, - { "serif", SkTypeface::kBold }, - { "serif", SkTypeface::kItalic }, - { "serif", SkTypeface::kBoldItalic }, - { "monospace", SkTypeface::kNormal } + { nullptr, SkFontStyle::Normal() }, + { nullptr, SkFontStyle::Bold() }, + { "serif", SkFontStyle::Normal() }, + { "serif", SkFontStyle::Bold() }, + { "serif", SkFontStyle::Italic() }, + { "serif", SkFontStyle::BoldItalic() }, + { "monospace", SkFontStyle::Normal() } }; static const int gFaceCount = SK_ARRAY_COUNT(gFaces); @@ -41,8 +42,7 @@ class FontScalerTestView : public SampleView { public: FontScalerTestView() { for (int i = 0; i < gFaceCount; i++) { - fFaces[i] = SkTypeface::MakeFromName( - gFaces[i].fName, SkFontStyle::FromOldStyle(gFaces[i].fStyle)); + fFaces[i] = SkTypeface::MakeFromName(gFaces[i].fName, gFaces[i].fStyle); } } diff --git a/samplecode/SampleSlides.cpp b/samplecode/SampleSlides.cpp index b8cf3800e0..91daa2a567 100644 --- a/samplecode/SampleSlides.cpp +++ b/samplecode/SampleSlides.cpp @@ -624,8 +624,7 @@ static void texteffect_slide(SkCanvas* canvas) { SkScalar x = 20; SkScalar y = 80; SkPaint paint; - paint.setTypeface(SkTypeface::MakeFromName("Georgia", - SkFontStyle::FromOldStyle(SkTypeface::kItalic))); + paint.setTypeface(SkTypeface::MakeFromName("Georgia", SkFontStyle::Italic())); paint.setTextSize(75); paint.setAntiAlias(true); paint.setColor(SK_ColorBLUE); |