kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Get metrics from custom named Open Sans if available

Browse source
This commit is contained in:
Eric Kotato 2020-04-24 16:58:38 +03:00
parent 499af3e481
commit 85ffed7fcc
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/style/style_core_font.cpp
View file

@ -159,6 +159,16 @@ QString MonospaceFont() {
return family;
}
QFontMetrics GetFontMetrics(int size) {
#ifdef DESKTOP_APP_USE_PACKAGED_FONTS
QFont originalFont("Open Sans");
#else // !DESKTOP_APP_USE_PACKAGED_FONTS
QFont originalFont("DAOpenSansRegular");
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
originalFont.setPixelSize(size);
return QFontMetrics(originalFont);
}
enum {
FontTypeRegular = 0,
FontTypeRegularItalic,
@ -385,10 +395,8 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
m = QFontMetrics(f);
if (UseOriginalMetrics) {
QFont originalFont(fontFamilies[family]);
originalFont.setPixelSize(size);
auto mOrig = QFontMetrics(originalFont);
if (UseOriginalMetrics && !(_flags & FontMonospace)) {
const auto mOrig = GetFontMetrics(size);
height = mOrig.height();
ascent = mOrig.ascent();