Skip to content

Add support for configuring font edging/hinting/subpixel to SkParagraph #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for configuring font edging/hinting/subpixel to SkParagraph #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/skparagraph/include/TextStyle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,15 @@ class TextStyle {
bool isPlaceholder() const { return fIsPlaceholder; }
void setPlaceholder() { fIsPlaceholder = true; }

void setFontEdging(SkFont::Edging edging) { fEdging = edging; }
SkFont::Edging getFontEdging() const { return fEdging; }

void setSubpixel(bool subpixel) { fSubpixel = subpixel; }
bool getSubpixel() const { return fSubpixel; }

void setFontHinting(SkFontHinting hinting) { fHinting = hinting; }
SkFontHinting getFontHinting() const { return fHinting; }

private:
static const std::vector<SkString>* kDefaultFontFamilies;

Expand All @@ -305,6 +314,9 @@ class TextStyle {
std::vector<SkString> fFontFamilies = *kDefaultFontFamilies;

SkScalar fFontSize = 14.0;
SkFont::Edging fEdging = SkFont::Edging::kAntiAlias;
bool fSubpixel = true;
SkFontHinting fHinting = SkFontHinting::kSlight;
SkScalar fHeight = 1.0;
bool fHeightOverride = false;
SkScalar fBaselineShift = 0.0f;
Expand Down
6 changes: 3 additions & 3 deletions modules/skparagraph/src/OneLineShaper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,9 @@ bool OneLineShaper::shape() {

// Create one more font to try
SkFont font(std::move(typeface), block.fStyle.getFontSize());
font.setEdging(SkFont::Edging::kAntiAlias);
font.setHinting(SkFontHinting::kSlight);
font.setSubpixel(true);
font.setEdging(block.fStyle.getFontEdging());
font.setHinting(block.fStyle.getFontHinting());
font.setSubpixel(block.fStyle.getSubpixel());

// Apply fake bold and/or italic settings to the font if the
// typeface's attributes do not match the intended font style.
Expand Down
6 changes: 3 additions & 3 deletions modules/skparagraph/src/TextLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,9 @@ std::unique_ptr<Run> TextLine::shapeEllipsis(const SkString& ellipsis, const Clu
auto shaped = [&](sk_sp<SkTypeface> typeface, sk_sp<SkFontMgr> fallback) -> std::unique_ptr<Run> {
ShapeHandler handler(run.heightMultiplier(), run.useHalfLeading(), run.baselineShift(), ellipsis);
SkFont font(std::move(typeface), textStyle.getFontSize());
font.setEdging(SkFont::Edging::kAntiAlias);
font.setHinting(SkFontHinting::kSlight);
font.setSubpixel(true);
font.setEdging(textStyle.getFontEdging());
font.setHinting(textStyle.getFontHinting());
font.setSubpixel(textStyle.getSubpixel());

std::unique_ptr<SkShaper> shaper = SkShapers::HB::ShapeDontWrapOrReorder(
fOwner->getUnicode(), fallback ? fallback : SkFontMgr::RefEmpty());
Expand Down
6 changes: 3 additions & 3 deletions modules/skparagraph/src/TextStyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,9 @@ bool TextStyle::matchOneAttribute(StyleType styleType, const TextStyle& other) c

void TextStyle::getFontMetrics(SkFontMetrics* metrics) const {
SkFont font(fTypeface, fFontSize);
font.setEdging(SkFont::Edging::kAntiAlias);
font.setSubpixel(true);
font.setHinting(SkFontHinting::kSlight);
font.setEdging(fEdging);
font.setSubpixel(fSubpixel);
font.setHinting(fHinting);
font.getMetrics(metrics);
if (fHeightOverride) {
auto multiplier = fHeight * fFontSize;
Expand Down