From 31bf0025150d216512248cf119f9167e6c6a69fe Mon Sep 17 00:00:00 2001 From: and3md Date: Sat, 27 Jan 2018 17:17:43 +0100 Subject: [PATCH 1/2] sdlUpdateScreenDPI() should return false when DPI override is set. --- src/dlangui/platforms/sdl/sdlapp.d | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d index 76e4bfa3..c225f94f 100644 --- a/src/dlangui/platforms/sdl/sdlapp.d +++ b/src/dlangui/platforms/sdl/sdlapp.d @@ -1593,7 +1593,7 @@ version (Windows) { } } -/// try to get screen resolution and update SCREEN_DPI; returns true if SCREEN_DPI is changed by this check +/// try to get screen resolution and update SCREEN_DPI; returns true if SCREEN_DPI is changed (when custom override DPI value is not set) bool sdlUpdateScreenDpi(int displayIndex = 0) { if (SDL_GetDisplayDPI is null) { Log.w("SDL_GetDisplayDPI is not found: cannot detect screen DPI"); @@ -1608,11 +1608,13 @@ bool sdlUpdateScreenDpi(int displayIndex = 0) { int idpi = cast(int)hdpi; if (idpi < 32 || idpi > 2000) return false; - Log.i("sdlUpdateScreenDpi: SCREEN_DPI=", idpi); - if (SCREEN_DPI != idpi) { - Log.i("sdlUpdateScreenDpi: SCREEN_DPI is changed from ", SCREEN_DPI, " to ", idpi); + Log.i("sdlUpdateScreenDpi: systemScreenDPI=", idpi); + if (overrideScreenDPI != 0) + Log.i("sdlUpdateScreenDpi: systemScreenDPI is overrided = ", overrideScreenDPI); + if (systemScreenDPI != idpi) { + Log.i("sdlUpdateScreenDpi: systemScreenDPI is changed from ", systemScreenDPI, " to ", idpi); SCREEN_DPI = idpi; - return true; + return (overrideScreenDPI == 0); } return false; } From aecc6ba7f97db6a7ba951cefd7728d3f6e9ee1c0 Mon Sep 17 00:00:00 2001 From: and3md Date: Sat, 27 Jan 2018 18:13:35 +0100 Subject: [PATCH 2/2] Do not import OpenGL when its disabled. --- src/dlangui/platforms/sdl/sdlapp.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d index c225f94f..9bac7073 100644 --- a/src/dlangui/platforms/sdl/sdlapp.d +++ b/src/dlangui/platforms/sdl/sdlapp.d @@ -40,10 +40,10 @@ import dlangui.widgets.widget; import dlangui.platforms.common.platform; import derelict.sdl2.sdl; -import derelict.opengl3.gl3; -import derelict.opengl3.gl; static if (ENABLE_OPENGL) { + import derelict.opengl3.gl3; + import derelict.opengl3.gl; import dlangui.graphics.gldrawbuf; import dlangui.graphics.glsupport; }