Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-05-20 13:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

(Ozone) Revert minimum font size enforcements (#15663)

Browse source
This commit is contained in:
sonninnos 2023-09-02 15:36:51 +03:00 committed by GitHub
parent 2e720fd9c1
commit b89a750d43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
menu/drivers/ozone.c
View file

@ -5333,7 +5333,9 @@ static int ozone_get_sublabel_max_width(ozone_handle_t *ozone,
unsigned entry_padding)
{
settings_t *settings = config_get_ptr();
int sublabel_max_width = video_info_width - (entry_padding * 2);
int sublabel_max_width = video_info_width
- (entry_padding * 2)
- (ozone->dimensions.entry_icon_padding * 2);
if (ozone->depth == 1)
sublabel_max_width -= (int)ozone->dimensions_sidebar_width;
@ -9048,8 +9050,6 @@ static void ozone_set_layout(
settings_t *settings = config_get_ptr();
bool font_inited = false;
float scale_factor = ozone->last_scale_factor;
float font_min_size = 9.0f;
float font_size = font_min_size;
/* Calculate dimensions */
ozone->dimensions.header_height = HEADER_HEIGHT * scale_factor;
@ -9152,52 +9152,32 @@ static void ozone_set_layout(
}
/* Sidebar */
font_size = FONT_SIZE_SIDEBAR * scale_factor;
if (font_size < font_min_size)
font_size = font_min_size;
font_inited = ozone_init_font(&ozone->fonts.sidebar,
is_threaded, font_path, font_size);
is_threaded, font_path, FONT_SIZE_SIDEBAR * scale_factor);
if (!(((ozone->flags & OZONE_FLAG_HAS_ALL_ASSETS) > 0) && font_inited))
ozone->flags &= ~OZONE_FLAG_HAS_ALL_ASSETS;
/* Entries */
font_size = FONT_SIZE_ENTRIES_LABEL * scale_factor;
if (font_size < font_min_size)
font_size = font_min_size;
font_inited = ozone_init_font(&ozone->fonts.entries_label,
is_threaded, font_path, font_size);
is_threaded, font_path, FONT_SIZE_ENTRIES_LABEL * scale_factor);
if (!(((ozone->flags & OZONE_FLAG_HAS_ALL_ASSETS) > 0) && font_inited))
ozone->flags &= ~OZONE_FLAG_HAS_ALL_ASSETS;
/* Sublabels */
font_size = FONT_SIZE_ENTRIES_SUBLABEL * scale_factor;
if (font_size < font_min_size - 2)
font_size = font_min_size - 2;
font_inited = ozone_init_font(&ozone->fonts.entries_sublabel,
is_threaded, font_path, font_size);
is_threaded, font_path, FONT_SIZE_ENTRIES_SUBLABEL * scale_factor);
if (!(((ozone->flags & OZONE_FLAG_HAS_ALL_ASSETS) > 0) && font_inited))
ozone->flags &= ~OZONE_FLAG_HAS_ALL_ASSETS;
/* Time */
font_size = FONT_SIZE_TIME * scale_factor;
if (font_size < font_min_size - 2)
font_size = font_min_size - 2;
font_inited = ozone_init_font(&ozone->fonts.time,
is_threaded, font_path, font_size);
is_threaded, font_path, FONT_SIZE_TIME * scale_factor);
if (!(((ozone->flags & OZONE_FLAG_HAS_ALL_ASSETS) > 0) && font_inited))
ozone->flags &= ~OZONE_FLAG_HAS_ALL_ASSETS;
/* Footer */
font_size = FONT_SIZE_FOOTER * scale_factor;
if (font_size < font_min_size - 2)
font_size = font_min_size - 2;
font_inited = ozone_init_font(&ozone->fonts.footer,
is_threaded, font_path, font_size);
is_threaded, font_path, FONT_SIZE_FOOTER * scale_factor);
if (!(((ozone->flags & OZONE_FLAG_HAS_ALL_ASSETS) > 0) && font_inited))
ozone->flags &= ~OZONE_FLAG_HAS_ALL_ASSETS;