mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8452 from natinusala/ozone-thumb-fix

Browse Source 
Ozone thumbnails display fix + add menu widgets notice in configure
This commit is contained in:
Twinaphex 2019-03-13 11:36:06 +01:00 committed by GitHub
commit b468592097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/drivers/ozone/ozone.c
View File

@ -197,6 +197,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded)
ozone->animations.thumbnail_bar_position = 0.0f;
ozone->show_thumbnail_bar = false;
ozone->dimensions.sidebar_width = 0.0f;
ozone_sidebar_update_collapse(ozone, false);
@ -700,7 +701,8 @@ static void ozone_context_reset(void *data, bool is_threaded)
+ ozone->dimensions.sidebar_entry_icon_padding * 2
+ ozone->dimensions.sidebar_padding_horizontal * 2;
ozone->dimensions.sidebar_width = (float) ozone->dimensions.sidebar_width_normal;
if (ozone->dimensions.sidebar_width == 0)
ozone->dimensions.sidebar_width = (float) ozone->dimensions.sidebar_width_normal;
ozone->dimensions.thumbnail_bar_width = ozone->dimensions.sidebar_width_normal
- ozone->dimensions.sidebar_entry_icon_size

2
menu/drivers/ozone/ozone.h
View File

@ -200,7 +200,7 @@ struct ozone_handle
int sidebar_width_normal;
int sidebar_width_collapsed;
float sidebar_width;
float sidebar_width; /* animated field */
int sidebar_padding_horizontal;
int sidebar_padding_vertical;
int sidebar_entry_padding_vertical;

2
menu/drivers/ozone/ozone_entries.c
View File

@ -737,7 +737,7 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, video_frame_info_t *video_i
}
/* Bottom row : "left" thumbnail or content metadata */
if (left_thumbnail)
if (thumbnail && left_thumbnail)
{
unsigned thumb_x_position = x_position + sidebar_width/2 - (ozone->dimensions.left_thumbnail_width + ozone->dimensions.sidebar_entry_icon_padding) / 2;
unsigned thumb_y_position = video_info->height / 2 + ozone->dimensions.sidebar_entry_icon_padding / 2;

43
menu/drivers/ozone/ozone_sidebar.c
View File

@ -746,30 +746,39 @@ bool ozone_is_playlist(ozone_handle_t *ozone, bool depth)
{
bool is_playlist;
switch (ozone->categories_selection_ptr)
if (ozone->categories_selection_ptr > ozone->system_tab_end)
{
case OZONE_SYSTEM_TAB_MAIN:
case OZONE_SYSTEM_TAB_SETTINGS:
case OZONE_SYSTEM_TAB_ADD:
is_playlist = false;
break;
case OZONE_SYSTEM_TAB_HISTORY:
case OZONE_SYSTEM_TAB_FAVORITES:
case OZONE_SYSTEM_TAB_MUSIC:
is_playlist = true;
}
else
{
switch (ozone->tabs[ozone->categories_selection_ptr])
{
case OZONE_SYSTEM_TAB_MAIN:
case OZONE_SYSTEM_TAB_SETTINGS:
case OZONE_SYSTEM_TAB_ADD:
#ifdef HAVE_NETWORKING
case OZONE_SYSTEM_TAB_NETPLAY:
#endif
is_playlist = false;
break;
case OZONE_SYSTEM_TAB_HISTORY:
case OZONE_SYSTEM_TAB_FAVORITES:
case OZONE_SYSTEM_TAB_MUSIC:
#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
case OZONE_SYSTEM_TAB_VIDEO:
case OZONE_SYSTEM_TAB_VIDEO:
#endif
#ifdef HAVE_IMAGEVIEWER
case OZONE_SYSTEM_TAB_IMAGES:
case OZONE_SYSTEM_TAB_IMAGES:
#endif
#ifdef HAVE_NETWORKING
case OZONE_SYSTEM_TAB_NETPLAY:
#endif
default:
is_playlist = true;
break;
default:
is_playlist = true;
break;
}
}
if (depth)
return is_playlist && ozone->depth == 1;

5
qb/config.libs.sh
View File

@ -509,6 +509,11 @@ if [ "$HAVE_MENU" != 'no' ]; then
fi
fi
if [ "$HAVE_MENU_WIDGETS" != 'no' ]; then
die : 'Notice: Menu widgets are not fully implemented and should not be enabled' \
'Please do not report any bug concerning widgets until this message is removed'
fi
check_macro NEON __ARM_NEON__
add_define MAKEFILE OS "$OS"