pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Maxim Kadushkin
2017-07-03 15:09:57 +03:00
parent 9a976c08fc 322c6f97da
commit eaa1396c01
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
win-linux/src/utils.cpp
View File

@ -261,6 +261,9 @@ QString Utils::encodeJson(const QString& s)
unsigned Utils::getScreenDpiRatio(int scrnum)
{
#ifdef __linux
double _k = _k = QApplication::primaryScreen()->logicalDotsPerInch() / 96.f;
#else
UINT _dpi_x = 0,
_dpi_y = 0;
double _k;
@ -270,6 +273,7 @@ unsigned Utils::getScreenDpiRatio(int scrnum)
} else {
_k = QApplication::primaryScreen()->logicalDotsPerInch() / 96.f;
}
#endif
return !(_k < 1.5) ? 2 : 1;
}
@ -295,7 +299,7 @@ unsigned Utils::getScreenDpiRatioByHWND(int hwnd)
QByteArray Utils::getAppStylesheets(int scale)
{
auto read_styles = [](QString& dir) {
auto read_styles = [](const QString& dir) {
QByteArray _css;
QFile file;
QFileInfoList files = QDir(dir).entryInfoList(QStringList("*.qss"), QDir::Files);