From 97e99b5dc1a8f4cb95d5a31c0d82f979bfd73b04 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 29 Jul 2019 15:45:08 +0900 Subject: [PATCH] Revert "[Tizen] Add environment variable to manually set DPI" This reverts commit 8a731ce249d711e8f55eafadf1800ae86f68a190. Change-Id: I8bbc42165ebaa2d6f68632b3c4c2ab8b737290c3 --- dali/internal/system/common/environment-variables.h | 4 ---- dali/internal/window-system/common/window-render-surface.cpp | 11 +---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dali/internal/system/common/environment-variables.h b/dali/internal/system/common/environment-variables.h index 3d63c00..0947bdb 100644 --- a/dali/internal/system/common/environment-variables.h +++ b/dali/internal/system/common/environment-variables.h @@ -118,10 +118,6 @@ namespace Adaptor #define DALI_ENV_WEB_ENGINE_NAME "DALI_WEB_ENGINE_NAME" -#define DALI_ENV_DPI_HORIZONTAL "DALI_DPI_HORIZONTAL" - -#define DALI_ENV_DPI_VERTICAL "DALI_DPI_VERTICAL" - } // namespace Adaptor } // namespace Internal diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index 6dc0e68..a89b444 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -179,16 +179,7 @@ PositionSize WindowRenderSurface::GetPositionSize() const void WindowRenderSurface::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { - const char* environmentDpiX = std::getenv("DALI_ENV_DPI_HORIZONTAL"); - dpiHorizontal = environmentDpiX ? std::atoi(environmentDpiX) : 0; - - const char* environmentDpiY = std::getenv("DALI_ENV_DPI_VERTICAL"); - dpiVertical = environmentDpiY ? std::atoi(environmentDpiY) : 0; - - if( dpiHorizontal == 0 || dpiVertical == 0 ) - { - mWindowBase->GetDpi( dpiHorizontal, dpiVertical ); - } + mWindowBase->GetDpi( dpiHorizontal, dpiVertical ); } int WindowRenderSurface::GetOrientation() const -- 2.7.4