mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 08:34:34 +02:00
Code Issues Releases Wiki Activity

* Try to always rely on DPI settings.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-08-20 03:50:41 +02:00
parent eb9f425f4b
commit 7ec9951739
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libtomahawk/utils/DpiScaler.cpp
View File

@@ -19,6 +19,7 @@
#include "DpiScaler.h" #include "DpiScaler.h"
#include "TomahawkUtilsGui.h" #include "TomahawkUtilsGui.h"
#include "utils/Logger.h"
namespace TomahawkUtils namespace TomahawkUtils
{ {
@@ -140,6 +141,9 @@ DpiScaler::ratioX( const QPaintDevice* pd )
qreal ratioFromFH = ratioFromFontHeight(); qreal ratioFromFH = ratioFromFontHeight();
qreal ratioYFromDpi = pd->logicalDpiY() / s_baseDpi; //using Y because we compare with height qreal ratioYFromDpi = pd->logicalDpiY() / s_baseDpi; //using Y because we compare with height
//HACK: don't trust font settings
return ratioYFromDpi;
//if the error is less than 1%, we trust that the logical DPI setting has the best value //if the error is less than 1%, we trust that the logical DPI setting has the best value
if ( qAbs( ratioFromFH / ratioYFromDpi - 1 ) < 0.01 ) if ( qAbs( ratioFromFH / ratioYFromDpi - 1 ) < 0.01 )
return pd->logicalDpiX() / s_baseDpi; return pd->logicalDpiX() / s_baseDpi;
@@ -154,6 +158,9 @@ DpiScaler::ratioY( const QPaintDevice* pd )
qreal ratioFromFH = ratioFromFontHeight(); qreal ratioFromFH = ratioFromFontHeight();
qreal ratioYFromDpi = pd->logicalDpiY() / s_baseDpi; //using Y because we compare with height qreal ratioYFromDpi = pd->logicalDpiY() / s_baseDpi; //using Y because we compare with height
//HACK: don't trust font settings
return ratioYFromDpi;
//if the error is less than 1%, we trust that the logical DPI setting has the best value //if the error is less than 1%, we trust that the logical DPI setting has the best value
if ( qAbs( ratioFromFH / ratioYFromDpi - 1 ) < 0.01 ) if ( qAbs( ratioFromFH / ratioYFromDpi - 1 ) < 0.01 )
return ratioYFromDpi; return ratioYFromDpi;