The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 06:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6800 from spycrab/qt_win32_weight

Browse Source 
Qt/Win32: Fix font weight calculation
This commit is contained in:
Léo Lam 2018-05-10 18:15:38 +02:00 committed by GitHub
commit 02e313050e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinQt2/Main.cpp
View File

@ -98,7 +98,7 @@ int main(int argc, char* argv[])
#ifdef _WIN32 #ifdef _WIN32
// Get the default system font because Qt's way of obtaining it is outdated // Get the default system font because Qt's way of obtaining it is outdated
NONCLIENTMETRICS metrics = {}; NONCLIENTMETRICS metrics = {};
auto& logfont = metrics.lfMenuFont; LOGFONT& logfont = metrics.lfMenuFont;
metrics.cbSize = sizeof(NONCLIENTMETRICS); metrics.cbSize = sizeof(NONCLIENTMETRICS);
if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(metrics), &metrics, 0)) if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(metrics), &metrics, 0))
@ -107,7 +107,12 @@ int main(int argc, char* argv[])
// thing // thing
QFont font = QApplication::font(); QFont font = QApplication::font();
font.setFamily(QString::fromStdString(UTF16ToUTF8(logfont.lfFaceName))); font.setFamily(QString::fromStdString(UTF16ToUTF8(logfont.lfFaceName)));
font.setWeight(logfont.lfWeight);
// LOGFONT uses a scale from 1 to 1000 to represent font weight while Qt uses a scale from 0
// to 99. LOGFONT also has a DONTCARE value which we have to ignore.
if (logfont.lfWeight != FW_DONTCARE)
font.setWeight((logfont.lfWeight / 10) - 1);
font.setItalic(logfont.lfItalic); font.setItalic(logfont.lfItalic);
font.setStrikeOut(logfont.lfStrikeOut); font.setStrikeOut(logfont.lfStrikeOut);
font.setUnderline(logfont.lfUnderline); font.setUnderline(logfont.lfUnderline);