From 2148f8ca0a4c3660621efd57ecc6703679068312 Mon Sep 17 00:00:00 2001
From: natinusala <natinusala@gmail.com>
Date: Thu, 28 Mar 2019 10:39:11 +0100
Subject: [PATCH] ozone: fix content metadata for images playlist
---
menu/drivers/ozone/ozone.c | 2 ++
menu/drivers/ozone/ozone.h | 1 +
menu/drivers/ozone/ozone_entries.c | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index c19c2d3618..62b1589c9a 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -1153,6 +1153,8 @@ void ozone_update_content_metadata(ozone_handle_t *ozone)
snprintf(ozone->selection_core_name, sizeof(ozone->selection_core_name),
"%s %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PLAYLIST_SUBLABEL_CORE), core_label);
+ ozone->selection_core_is_imageviewer = string_is_equal(core_label, "imageviewer");
+
word_wrap(ozone->selection_core_name, ozone->selection_core_name, (unsigned)((float)ozone->dimensions.thumbnail_bar_width * (float)0.85) / ozone->footer_font_glyph_width, false);
ozone->selection_core_name_lines = ozone_count_lines(ozone->selection_core_name);
diff --git a/menu/drivers/ozone/ozone.h b/menu/drivers/ozone/ozone.h
index 16f2d44b00..a6772505f7 100644
--- a/menu/drivers/ozone/ozone.h
+++ b/menu/drivers/ozone/ozone.h
@@ -240,6 +240,7 @@ struct ozone_handle
char selection_playtime[255];
char selection_lastplayed[255];
unsigned selection_core_name_lines;
+ bool selection_core_is_imageviewer;
bool is_db_manager_list;
};
diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
index fa4647e3ff..7266823ae5 100644
--- a/menu/drivers/ozone/ozone_entries.c
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -743,7 +743,7 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, video_frame_info_t *video_i
ozone_pure_white
);
}
- else if (!string_is_equal(ozone->selection_core_name, "imageviewer"))
+ else if (!ozone->selection_core_is_imageviewer)
{
unsigned y = video_info->height / 2 + ozone->dimensions.sidebar_entry_icon_padding / 2;
unsigned content_metadata_padding = ozone->dimensions.sidebar_entry_icon_padding*3;