kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Restore Open Sans tilde fix for system font

Browse source
This commit is contained in:
Eric Kotato 2020-03-16 00:00:29 +03:00
parent e6fdff4597
commit 70af81fc56
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/text/text.cpp
View file

@ -2027,13 +2027,9 @@ private:
result = style::font(f->size(), f->flags(), result->family()); result = style::font(f->size(), f->flags(), result->family());
} }
} }
}
if (flags & TextBlockFItalic) result = result->italic(); if (flags & TextBlockFItalic) result = result->italic();
if (flags & TextBlockFUnderline) result = result->underline(); if (flags & TextBlockFUnderline) result = result->underline();
if (flags & TextBlockFStrikeOut) result = result->strikeout(); if (flags & TextBlockFStrikeOut) result = result->strikeout();
if (flags & TextBlockFSemibold) {
if (flags & TextBlockFTilde) { // tilde fix in OpenSans if (flags & TextBlockFTilde) { // tilde fix in OpenSans
result = st::semiboldFont; result = st::semiboldFont;
} }

4
ui/text/text_block.cpp
View file

@ -335,13 +335,9 @@ TextBlock::TextBlock(const style::font &font, const QString &str, QFixed minResi
blockFont = style::font(font->size(), font->flags(), blockFont->family()); blockFont = style::font(font->size(), font->flags(), blockFont->family());
} }
} }
}
if (flags & TextBlockFItalic) blockFont = blockFont->italic(); if (flags & TextBlockFItalic) blockFont = blockFont->italic();
if (flags & TextBlockFUnderline) blockFont = blockFont->underline(); if (flags & TextBlockFUnderline) blockFont = blockFont->underline();
if (flags & TextBlockFStrikeOut) blockFont = blockFont->strikeout(); if (flags & TextBlockFStrikeOut) blockFont = blockFont->strikeout();
if (flags & TextBlockFSemibold) {
if (flags & TextBlockFTilde) { // tilde fix in OpenSans if (flags & TextBlockFTilde) { // tilde fix in OpenSans
blockFont = st::semiboldFont; blockFont = st::semiboldFont;
} }