From 078df8ba39238580266cacc8d9b939aa61b0dcc8 Mon Sep 17 00:00:00 2001 From: sonninnos <45124675+sonninnos@users.noreply.github.com> Date: Fri, 1 Sep 2023 12:25:33 +0300 Subject: [PATCH] (Ozone) Sublabel width tweak (#15657) --- menu/drivers/ozone.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index db0df12211..45a04b387a 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -5328,16 +5328,15 @@ static void ozone_update_scroll( } } -static unsigned ozone_get_sublabel_max_width(ozone_handle_t *ozone, +static int ozone_get_sublabel_max_width(ozone_handle_t *ozone, unsigned video_info_width, unsigned entry_padding) { settings_t *settings = config_get_ptr(); - float menu_scale_factor = settings->floats.menu_scale_factor; - unsigned sublabel_max_width = video_info_width - (menu_scale_factor * (entry_padding * 2)); + int sublabel_max_width = video_info_width - (entry_padding * 2); if (ozone->depth == 1) - sublabel_max_width -= (unsigned) ozone->dimensions_sidebar_width; + sublabel_max_width -= (int)ozone->dimensions_sidebar_width; if (ozone->show_thumbnail_bar) { if (ozone->is_quick_menu && menu_is_running_quick_menu()) @@ -5420,7 +5419,7 @@ static void ozone_compute_entries_position( { if (!string_is_empty(entry.sublabel)) { - unsigned sublabel_max_width = ozone_get_sublabel_max_width(ozone, video_info_width, entry_padding); + int sublabel_max_width = ozone_get_sublabel_max_width(ozone, video_info_width, entry_padding); char wrapped_sublabel_str[MENU_SUBLABEL_MAX_LENGTH]; wrapped_sublabel_str[0] = '\0'; @@ -5762,7 +5761,7 @@ border_iterate: { if (node->wrap && !string_is_empty(sublabel_str)) { - unsigned sublabel_max_width = ozone_get_sublabel_max_width(ozone, video_info_width, entry_padding); + int sublabel_max_width = ozone_get_sublabel_max_width(ozone, video_info_width, entry_padding); char wrapped_sublabel_str[MENU_SUBLABEL_MAX_LENGTH]; wrapped_sublabel_str[0] = '\0';