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

(XMB) Use variables instead of defines for icon placement

Browse Source
This commit is contained in:
Jean-André Santoni 2016-05-09 04:05:11 +07:00
parent 08de0c75eb
commit dfe9419522
1 changed files with 14 additions and 10 deletions

24
menu/drivers/xmb.c

@ -56,11 +56,6 @@
#define XMB_DELAY 10 #define XMB_DELAY 10
#endif #endif
#define XMB_ABOVE_OFFSET_SUBITEM 1.5
#define XMB_ABOVE_OFFSET_ITEM -1.0
#define XMB_ITEM_ACTIVE_FACTOR 3.0
#define XMB_UNDER_OFFSET_ITEM 5.0
#define XMB_CATEGORIES_ACTIVE_ZOOM 1.0 #define XMB_CATEGORIES_ACTIVE_ZOOM 1.0
#define XMB_CATEGORIES_PASSIVE_ZOOM 0.5 #define XMB_CATEGORIES_PASSIVE_ZOOM 0.5
#define XMB_ITEM_ACTIVE_ZOOM 1.0 #define XMB_ITEM_ACTIVE_ZOOM 1.0
@ -180,6 +175,10 @@ typedef struct xmb_handle
} label; } label;
} margins; } margins;
float above_subitem_offset;
float above_item_offset;
float active_item_factor;
float under_item_offset;
float shadow_offset; float shadow_offset;
char title_name[256]; char title_name[256];
@ -453,14 +452,14 @@ static float xmb_item_y(xmb_handle_t *xmb, int i, size_t current)
if (i < (int)current) if (i < (int)current)
if (xmb->depth > 1) if (xmb->depth > 1)
iy *= (i - (int)current + XMB_ABOVE_OFFSET_SUBITEM); iy *= (i - (int)current + xmb->above_subitem_offset);
else else
iy *= (i - (int)current + XMB_ABOVE_OFFSET_ITEM); iy *= (i - (int)current + xmb->above_item_offset);
else else
iy *= (i - (int)current + XMB_UNDER_OFFSET_ITEM); iy *= (i - (int)current + xmb->under_item_offset);
if (i == (int)current) if (i == (int)current)
iy = xmb->icon.spacing.vertical * XMB_ITEM_ACTIVE_FACTOR; iy = xmb->icon.spacing.vertical * xmb->active_item_factor;
return iy; return iy;
} }
@ -2143,7 +2142,7 @@ static void xmb_frame(void *data)
xmb->icon.spacing.horizontal - xmb->icon.size / 2.0 + xmb->icon.size, xmb->icon.spacing.horizontal - xmb->icon.size / 2.0 + xmb->icon.size,
xmb->margins.screen.top + xmb->margins.screen.top +
xmb->icon.size / 2.0 + xmb->icon.spacing.vertical xmb->icon.size / 2.0 + xmb->icon.spacing.vertical
* XMB_ITEM_ACTIVE_FACTOR, * xmb->active_item_factor,
width, width,
height, height,
xmb->textures.arrow.alpha, xmb->textures.arrow.alpha,
@ -2325,6 +2324,11 @@ static void xmb_layout(xmb_handle_t *xmb)
xmb->margins.screen.left = 336.0 * scale_factor; xmb->margins.screen.left = 336.0 * scale_factor;
xmb->shadow_offset = 2.0; xmb->shadow_offset = 2.0;
xmb->above_subitem_offset = 1.5;
xmb->above_item_offset = -1.0;
xmb->active_item_factor = 3.0;
xmb->under_item_offset = 5.0;
/* Mimic the layout of the PSP instead of the PS3 on tiny screens */ /* Mimic the layout of the PSP instead of the PS3 on tiny screens */
if (width <= 640) if (width <= 640)
{ {