Multiple custom font size by scale
This commit is contained in:
parent
300dd975a5
commit
1387b4fd1f
1 changed files with 2 additions and 1 deletions
|
|
@ -7,6 +7,7 @@
|
||||||
#include "ui/style/style_core_custom_font.h"
|
#include "ui/style/style_core_custom_font.h"
|
||||||
|
|
||||||
#include "ui/style/style_core_font.h"
|
#include "ui/style/style_core_font.h"
|
||||||
|
#include "ui/style/style_core_scale.h"
|
||||||
#include "ui/integration.h"
|
#include "ui/integration.h"
|
||||||
|
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
|
@ -81,7 +82,7 @@ QFont ResolveFont(uint32 flags, int size) {
|
||||||
|
|
||||||
result.setUnderline(flags & FontUnderline);
|
result.setUnderline(flags & FontUnderline);
|
||||||
result.setStrikeOut(flags & FontStrikeOut);
|
result.setStrikeOut(flags & FontStrikeOut);
|
||||||
result.setPixelSize(size + fontSettings.fontSize);
|
result.setPixelSize(size + ConvertScale(fontSettings.fontSize));
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue