Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-01 03:53:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply DPI Scaling to GUIModalMenu (#12693)

Browse Source 
Co-authored-by: sfan5 <sfan5@live.de>
This commit is contained in:
Elliott Lester 2022-08-15 13:19:47 -07:00 committed by sfan5
parent 50df5e2f59
commit 57b4d46dbc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/modalMenu.cpp
View File

@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/ */
#include <cstdlib> #include <cstdlib>
#include "client/renderingengine.h"
#include "modalMenu.h" #include "modalMenu.h"
#include "gettext.h" #include "gettext.h"
#include "porting.h" #include "porting.h"
@ -26,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
#include "touchscreengui.h" #include "touchscreengui.h"
#include "client/renderingengine.h"
#endif #endif
// clang-format off // clang-format off
@ -41,10 +41,13 @@ GUIModalMenu::GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent,
m_remap_dbl_click(remap_dbl_click) m_remap_dbl_click(remap_dbl_click)
{ {
m_gui_scale = std::max(g_settings->getFloat("gui_scaling"), 0.5f); m_gui_scale = std::max(g_settings->getFloat("gui_scaling"), 0.5f);
const float screen_dpi_scale = RenderingEngine::getDisplayDensity();
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
float d = RenderingEngine::getDisplayDensity(); m_gui_scale *= 1.1f - 0.3f * screen_dpi_scale + 0.2f * screen_dpi_scale * screen_dpi_scale;
m_gui_scale *= 1.1 - 0.3 * d + 0.2 * d * d; #else
m_gui_scale *= screen_dpi_scale;
#endif #endif
setVisible(true); setVisible(true);
Environment->setFocus(this); Environment->setFocus(this);
m_menumgr->createdMenu(this); m_menumgr->createdMenu(this);