luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 16:15:20 +02:00
Code Activity

Fix max_formspec_size not taking gui_scaling into account (#13493)

Browse Source
This commit is contained in:
Gregor Parzefall
2023-07-07 21:42:43 +02:00
committed by GitHub
parent 078bd95a49
commit 0218963f1b
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/game.cpp
View File

@@ -885,7 +885,6 @@ private:
static const ClientEventHandler clientEventHandler[CLIENTEVENT_MAX];
f32 getSensitivityScaleFactor() const;
ClientDynamicInfo getCurrentDynamicInfo() const;
InputHandler *input = nullptr;
@@ -1199,7 +1198,7 @@ void Game::run()
// + Sleep time until the wanted FPS are reached
draw_times.limit(device, &dtime);
const auto current_dynamic_info = getCurrentDynamicInfo();
const auto current_dynamic_info = ClientDynamicInfo::getCurrent();
if (!current_dynamic_info.equal(client_display_info)) {
client_display_info = current_dynamic_info;
dynamic_info_send_timer = 0.2f;
@@ -2601,19 +2600,6 @@ f32 Game::getSensitivityScaleFactor() const
return tan(fov_y / 2.0f) * 1.3763818698f;
}
ClientDynamicInfo Game::getCurrentDynamicInfo() const
{
v2u32 screen_size = RenderingEngine::getWindowSize();
f32 density = RenderingEngine::getDisplayDensity();
f32 gui_scaling = g_settings->getFloat("gui_scaling") * density;
f32 hud_scaling = g_settings->getFloat("hud_scaling") * density;
return {
screen_size, gui_scaling, hud_scaling,
ClientDynamicInfo::calculateMaxFSSize(screen_size)
};
}
void Game::updateCameraOrientation(CameraOrientation *cam, float dtime)
{
#ifdef HAVE_TOUCHSCREENGUI