kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow to change font size

Browse source
This commit is contained in:
Ilya Fedin 2021-05-29 09:43:12 +04:00
parent b63ea44056
commit 0f744f1d97
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/style/style_core_custom_font.cpp
View file

@ -29,6 +29,7 @@ void SetCustomFonts(const CustomFont &regular, const CustomFont &bold) {
QFont ResolveFont(uint32 flags, int size) {
static auto Database = QFontDatabase();
const auto fontSettings = Ui::Integration::Instance().fontSettings();
const auto overrideIsEmpty = GetPossibleEmptyOverride(flags).isEmpty();
const auto bold = ((flags & FontBold) || (flags & FontSemibold));
@ -47,7 +48,6 @@ QFont ResolveFont(uint32 flags, int size) {
const auto point = good.isEmpty() ? size : good.front();
result = Database.font(custom.family, custom.style, point);
} else {
const auto fontSettings = Ui::Integration::Instance().fontSettings();
if (!fontSettings.useSystemFont || !overrideIsEmpty) {
result.setFamily(GetFontOverride(flags));
}
@ -80,7 +80,7 @@ QFont ResolveFont(uint32 flags, int size) {
result.setUnderline(flags & FontUnderline);
result.setStrikeOut(flags & FontStrikeOut);
result.setPixelSize(size);
result.setPixelSize(size + fontSettings.fontSize);
return result;
}

1
ui/style/style_core_custom_font.h
View file

@ -17,6 +17,7 @@ struct CustomFontSettings {
QString mainFont;
QString semiboldFont;
QString monospaceFont;
int fontSize = 0;
bool semiboldIsBold = false;
bool useSystemFont = false;
bool useOriginalMetrics = false;