Merge pull request #6463 from Tatsuya79/patch-2

MUI New dpi calculation. (needs improvement)
This commit is contained in:
Twinaphex 2018-03-28 16:22:52 +02:00 committed by GitHub
commit 942121462d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -536,20 +536,19 @@ void menu_display_unset_framebuffer_dirty_flag(void)
* RGUI or XMB use this. */
float menu_display_get_dpi(void)
{
gfx_ctx_metrics_t metrics;
settings_t *settings = config_get_ptr();
float dpi = menu_dpi_override_value;
float dpi;
unsigned width, height;
video_driver_get_size(&width, &height);
if (!settings)
return true;
metrics.type = DISPLAY_METRIC_DPI;
metrics.value = &dpi;
dpi = sqrt((width * width) + (height * height)) / 6.5;
if (settings->bools.menu_dpi_override_enable)
return settings->uints.menu_dpi_override_value;
else if (!video_context_driver_get_metrics(&metrics) || !dpi)
return menu_dpi_override_value;
return dpi;
}