mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7493 from natinusala/ozone

Browse Source 
Ozone libnx fixes
This commit is contained in:
Twinaphex 2018-10-27 15:44:57 +02:00 committed by GitHub
commit 099b04c557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.libnx
View File

@ -58,7 +58,7 @@ ifeq ($(HAVE_OPENGL), 1)
HAVE_ZARCH = 0
HAVE_XMB = 1
HAVE_OZONE = 0
HAVE_OZONE = 1
HAVE_STRIPES = 0
HAVE_OVERLAY = 1

4
configuration.c
View File

@ -535,8 +535,8 @@ static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
#elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI;
#elif defined(HAVE_OZONE) && defined(HAVE_LIBNX)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE;
/* #elif defined(HAVE_OZONE) && defined(HAVE_LIBNX)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE; */
#elif defined(HAVE_XMB) && !defined(_XBOX)
static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
#elif defined(HAVE_RGUI)

10
menu/drivers/ozone.c
View File

@ -2040,7 +2040,7 @@ static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_i
/* TODO Reduce sidebar width ? */
static void ozone_draw_cursor(ozone_handle_t *ozone, video_frame_info_t *video_info, unsigned x_offset, unsigned entry_width, size_t y, float alpha)
static void ozone_draw_cursor(ozone_handle_t *ozone, video_frame_info_t *video_info, int x_offset, unsigned entry_width, size_t y, float alpha)
{
ozone_color_alpha(ozone->theme_dynamic.selection_border, alpha);
ozone_color_alpha(ozone->theme_dynamic.selection, alpha);
@ -2193,7 +2193,7 @@ static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_
size_t i, y, entries_end;
float sidebar_offset, bottom_boundary, invert, alpha_anim;
unsigned video_info_height, entry_width;
unsigned x_offset = 0;
int x_offset = 0;
size_t selection_y = 0;
size_t old_selection_y = 0;
@ -2222,7 +2222,7 @@ static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_
x_offset = invert * (alpha_anim * 120); /* right */
}
x_offset += (unsigned) sidebar_offset;
x_offset += (int) sidebar_offset;
alpha_uint32 = (uint32_t)(alpha*255.0f);
/* Borders layer */
@ -2660,7 +2660,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
new_selection = (ozone->categories_selection_ptr + 1);
if (new_selection >= ozone->system_tab_end + 2) /* TODO Check against actual tabs count and not just system tabs */
if (new_selection > ozone->system_tab_end) /* TODO Check against actual tabs count and not just system tabs */
new_selection = 0;
if (ozone->categories_selection_ptr != new_selection)
@ -2699,7 +2699,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
new_selection = ozone->categories_selection_ptr - 1;
if (new_selection < 0)
new_selection = ozone->system_tab_end + 1; /* TODO Set this to actual tabs count and not just system tabs */
new_selection = ozone->system_tab_end; /* TODO Set this to actual tabs count and not just system tabs */
if (ozone->categories_selection_ptr != new_selection)
{