mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_driver.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-01-02 18:21:43 +01:00
parent bfd283e2a6
commit a6245185b9
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/menu_driver.c
View File

@ -1985,8 +1985,11 @@ float menu_display_get_pixel_scale(unsigned width, unsigned height)
/* Apply user scaling factor */
if (settings)
return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
settings->floats.menu_scale_factor : 1.0f);
{
float menu_scale_factor = settings->floats.menu_scale_factor;
return scale * ((menu_scale_factor > 0.0001f) ?
menu_scale_factor : 1.0f);
}
return scale;
}
@ -1997,8 +2000,12 @@ float menu_display_get_dpi_scale(unsigned width, unsigned height)
static unsigned last_height = 0;
static float scale = 0.0f;
static bool scale_cached = false;
float menu_scale_factor = 0.0f;
settings_t *settings = config_get_ptr();
if (settings)
menu_scale_factor = settings->floats.menu_scale_factor;
/* Scale is based on display metrics - these are a fixed
* hardware property. To minimise performance overheads
* we therefore only call video_context_driver_get_metrics()
@ -2028,14 +2035,14 @@ float menu_display_get_dpi_scale(unsigned width, unsigned height)
#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
if (true)
{
scale = (diagonal_pixels / 6.5f) / 212.0f;
scale_cached = true;
last_width = width;
last_height = height;
scale = (diagonal_pixels / 6.5f) / 212.0f;
scale_cached = true;
last_width = width;
last_height = height;
if (settings)
return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
settings->floats.menu_scale_factor : 1.0f);
return scale * ((menu_scale_factor > 0.0001f) ?
menu_scale_factor : 1.0f);
return scale;
}
@ -2143,8 +2150,8 @@ float menu_display_get_dpi_scale(unsigned width, unsigned height)
/* Apply user scaling factor */
if (settings)
return scale * ((settings->floats.menu_scale_factor > 0.0001f) ?
settings->floats.menu_scale_factor : 1.0f);
return scale * ((menu_scale_factor > 0.0001f) ?
menu_scale_factor : 1.0f);
return scale;
}