From dceb9f7d6058785cf60d9dbcc8eecdcee1053412 Mon Sep 17 00:00:00 2001 From: sapier Date: Sun, 23 Nov 2014 13:40:43 +0100 Subject: Implement proper font handling --- src/porting.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/porting.cpp') diff --git a/src/porting.cpp b/src/porting.cpp index 2fc5d0364..42ee2ffe2 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -553,16 +553,7 @@ v2u32 getWindowSize() { #ifndef __ANDROID__ float getDisplayDensity() { - float gui_scaling = g_settings->getFloat("gui_scaling"); - // using Y here feels like a bug, this needs to be discussed later! - if (getWindowSize().Y <= 800) { - return (2.0/3.0) * gui_scaling; - } - if (getWindowSize().Y <= 1280) { - return 1.0 * gui_scaling; - } - - return (4.0/3.0) * gui_scaling; + return g_settings->getFloat("screen_dpi")/96.0; } v2u32 getDisplaySize() { -- cgit v1.2.3