kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow a bit more font size adjusting.

Browse source
This commit is contained in:
John Preston 2024-04-26 20:16:20 +04:00
parent 6d1014fa8f
commit cb57bef3f0
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/style/style_core_font.cpp
View file

@ -169,7 +169,13 @@ bool LoadCustomFont(const QString &filePath) {
const auto nowHeight = metrics.height(); const auto nowHeight = metrics.height();
const auto nowCap = metrics.capHeight(); const auto nowCap = metrics.capHeight();
if (nowHeight > desiredHeight || nowCap > desiredCap) { if (nowHeight > desiredHeight || nowCap > desiredCap) {
return (size + shift - 1); const auto heightBetter = (nowHeight - desiredHeight)
< (desiredHeight - currentHeight);
const auto capBetter = (nowCap - desiredCap)
< (desiredCap - currentCap);
return (heightBetter && capBetter)
? (size + shift)
: (size + shift - 1);
} }
currentHeight = nowHeight; currentHeight = nowHeight;
currentCap = nowCap; currentCap = nowCap;
@ -183,7 +189,13 @@ bool LoadCustomFont(const QString &filePath) {
const auto nowHeight = metrics.height(); const auto nowHeight = metrics.height();
const auto nowCap = metrics.capHeight(); const auto nowCap = metrics.capHeight();
if (nowHeight < desiredHeight || nowCap < desiredCap) { if (nowHeight < desiredHeight || nowCap < desiredCap) {
return (size - shift + 1); const auto heightBetter = (desiredHeight - nowHeight)
< (currentHeight - desiredHeight);
const auto capBetter = (desiredCap - nowCap)
< (currentCap - desiredCap);
return (heightBetter && capBetter)
? (size - shift)
: (size - shift + 1);
} }
currentHeight = nowHeight; currentHeight = nowHeight;
currentCap = nowCap; currentCap = nowCap;