office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 11:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.14'

Browse source 
Conflicts:
	VERSION
	core/version.h
This commit is contained in:
Albert Astals Cid 2014-07-21 23:49:33 +02:00
parent f8cb4789fc 60bcd3975d
commit 11ec9723e8
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/utils.cpp
View file

@ -150,7 +150,11 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
kDebug() << "Output is vertical, transposing DPI rect";
res.transpose();
}
return res;
if (qAbs(res.width() - res.height()) / qMin(res.height(), res.width()) < 0.05) {
return res;
} else {
kDebug() << "KScreen calculation returned a non square dpi." << res << ". Falling back";
}
}
}
else
@ -166,7 +170,22 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
}
// this is also fallback for LibKScreen branch if KScreen::Output
// for particular widget was not found
return QSizeF(realDpiX(), realDpiY());
QSizeF res = QSizeF(realDpiX(), realDpiY());
if (qAbs(res.width() - res.height()) / qMin(res.height(), res.width()) < 0.05) {
return res;
} else {
kDebug() << "QDesktopWidget calculation returned a non square dpi." << res << ". Falling back";
}
res = QSizeF(dpiX(), dpiY());
if (qAbs(res.width() - res.height()) / qMin(res.height(), res.width()) < 0.05) {
return res;
} else {
kDebug() << "QX11Info returned a non square dpi." << res << ". Falling back";
}
res = QSizeF(72, 72);
return res;
}
#elif defined(Q_WS_MAC)