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

Merge pull request #856 from lakkatv/lakka

Browse Source 
(Lakka) Icon and labels placement adjustments
This commit is contained in:
Twinaphex 2014-08-07 20:06:22 +02:00
commit eb1de2cf44
2 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
frontend/menu/disp/lakka.c
View File

@ -64,10 +64,10 @@ float LABEL_MARGIN_LEFT;
float LABEL_MARGIN_TOP; float LABEL_MARGIN_TOP;
int ICON_SIZE; int ICON_SIZE;
char ICON_DIR[3]; char ICON_DIR[3];
int ABOVE_SUBITEM_OFFSET; float ABOVE_SUBITEM_OFFSET;
int ABOVE_ITEM_OFFSET; float ABOVE_ITEM_OFFSET;
float ACTIVE_ITEM_FACTOR; float ACTIVE_ITEM_FACTOR;
int UNDER_ITEM_OFFSET; float UNDER_ITEM_OFFSET;
// Font variables // Font variables
void *font; void *font;
@ -116,27 +116,30 @@ static void lakka_responsive(void)
if (!gl) if (!gl)
return; return;
C_ACTIVE_ZOOM = 1.0;
C_PASSIVE_ZOOM = 0.5;
I_ACTIVE_ZOOM = 1.0;
I_PASSIVE_ZOOM = 0.5;
ABOVE_SUBITEM_OFFSET = 1.5;
ABOVE_ITEM_OFFSET = -1.0;
ACTIVE_ITEM_FACTOR = 2.25;
UNDER_ITEM_OFFSET = 3.0;
if (gl->win_width >= 2560) if (gl->win_width >= 2560)
{ {
ICON_SIZE = 256; ICON_SIZE = 256;
HSPACING = 400; HSPACING = 400;
VSPACING = 100; VSPACING = 128;
C_ACTIVE_ZOOM = 1.0;
C_PASSIVE_ZOOM = 0.5;
I_ACTIVE_ZOOM = 0.75;
I_PASSIVE_ZOOM = 0.35;
FONT_SIZE = 42.0; FONT_SIZE = 42.0;
MARGIN_LEFT = 200.0; MARGIN_LEFT = 200.0;
MARGIN_TOP = 400.0; MARGIN_TOP = 384.0;
TITLE_MARGIN_LEFT = 20.0; TITLE_MARGIN_LEFT = 20.0;
TITLE_MARGIN_TOP = 50.0; TITLE_MARGIN_TOP = 50.0;
LABEL_MARGIN_LEFT = 128; LABEL_MARGIN_LEFT = 128 + 16.0;
LABEL_MARGIN_TOP = 15; LABEL_MARGIN_TOP = 15;
strcpy(ICON_DIR, "256"); strcpy(ICON_DIR, "256");
ABOVE_SUBITEM_OFFSET = 2;
ABOVE_ITEM_OFFSET = -1;
ACTIVE_ITEM_FACTOR = 2.4;
UNDER_ITEM_OFFSET = 3;
return; return;
} }
@ -144,23 +147,15 @@ static void lakka_responsive(void)
{ {
ICON_SIZE = 192; ICON_SIZE = 192;
HSPACING = 300; HSPACING = 300;
VSPACING = 75; VSPACING = 96;
C_ACTIVE_ZOOM = 1.0;
C_PASSIVE_ZOOM = 0.5;
I_ACTIVE_ZOOM = 0.75;
I_PASSIVE_ZOOM = 0.35;
FONT_SIZE = 32.0; FONT_SIZE = 32.0;
MARGIN_LEFT = 156.0; MARGIN_LEFT = 156.0;
MARGIN_TOP = 300.0; MARGIN_TOP = 288.0;
TITLE_MARGIN_LEFT = 15.0; TITLE_MARGIN_LEFT = 15.0;
TITLE_MARGIN_TOP = 40.0; TITLE_MARGIN_TOP = 40.0;
LABEL_MARGIN_LEFT = 96; LABEL_MARGIN_LEFT = 96.0 + 12.0;
LABEL_MARGIN_TOP = 11; LABEL_MARGIN_TOP = 11.0;
strcpy(ICON_DIR, "192"); strcpy(ICON_DIR, "192");
ABOVE_SUBITEM_OFFSET = 2;
ABOVE_ITEM_OFFSET = -1;
ACTIVE_ITEM_FACTOR = 2.4;
UNDER_ITEM_OFFSET = 3;
return; return;
} }
@ -169,44 +164,28 @@ static void lakka_responsive(void)
ICON_SIZE = 64; ICON_SIZE = 64;
HSPACING = 100.0; HSPACING = 100.0;
VSPACING = 32.0; VSPACING = 32.0;
C_ACTIVE_ZOOM = 1.0;
C_PASSIVE_ZOOM = 0.5;
I_ACTIVE_ZOOM = 1.0;
I_PASSIVE_ZOOM = 0.5;
FONT_SIZE = 16; FONT_SIZE = 16;
MARGIN_LEFT = 60.0; MARGIN_LEFT = 60.0;
MARGIN_TOP = 100.0; MARGIN_TOP = 96.0;
TITLE_MARGIN_LEFT = 10.0; TITLE_MARGIN_LEFT = 10.0;
TITLE_MARGIN_TOP = 24.0; TITLE_MARGIN_TOP = 24.0;
LABEL_MARGIN_LEFT = 35.0; LABEL_MARGIN_LEFT = 32.0 + 4.0;
LABEL_MARGIN_TOP = 6.0; LABEL_MARGIN_TOP = 6.0;
strcpy(ICON_DIR, "64"); strcpy(ICON_DIR, "64");
ABOVE_SUBITEM_OFFSET = 2;
ABOVE_ITEM_OFFSET = -1;
ACTIVE_ITEM_FACTOR = 2.25;
UNDER_ITEM_OFFSET = 3;
return; return;
} }
ICON_SIZE = 128; ICON_SIZE = 128;
HSPACING = 200.0; HSPACING = 200.0;
VSPACING = 50.0; VSPACING = 64.0;
C_ACTIVE_ZOOM = 1.0;
C_PASSIVE_ZOOM = 0.5;
I_ACTIVE_ZOOM = 0.75;
I_PASSIVE_ZOOM = 0.35;
FONT_SIZE = 24; FONT_SIZE = 24;
MARGIN_LEFT = 120.0; MARGIN_LEFT = 120.0;
MARGIN_TOP = 200.0; MARGIN_TOP = 192.0;
TITLE_MARGIN_LEFT = 15.0; TITLE_MARGIN_LEFT = 15.0;
TITLE_MARGIN_TOP = 35.0; TITLE_MARGIN_TOP = 35.0;
LABEL_MARGIN_LEFT = 70.0; LABEL_MARGIN_LEFT = 64.0 + 8.0;
LABEL_MARGIN_TOP = 11.0; LABEL_MARGIN_TOP = 8.0;
strcpy(ICON_DIR, "128"); strcpy(ICON_DIR, "128");
ABOVE_SUBITEM_OFFSET = 2;
ABOVE_ITEM_OFFSET = -1;
ACTIVE_ITEM_FACTOR = 2.4;
UNDER_ITEM_OFFSET = 3;
} }
static char *str_replace (const char *string, const char *substr, const char *replacement) static char *str_replace (const char *string, const char *substr, const char *replacement)
@ -451,13 +430,13 @@ static void lakka_draw_subitems(int i, int j)
&& strcmp(g_extern.fullpath, &active_item->rom) == 0) && strcmp(g_extern.fullpath, &active_item->rom) == 0)
{ {
lakka_draw_icon(textures[TEXTURE_RESUME].id, lakka_draw_icon(textures[TEXTURE_RESUME].id,
MARGIN_LEFT + HSPACING*(i+2) + all_categories_x - ICON_SIZE/2.0, MARGIN_LEFT + HSPACING*(i+2.25) + all_categories_x - ICON_SIZE/2.0,
MARGIN_TOP + subitem->y + ICON_SIZE/2.0, MARGIN_TOP + subitem->y + ICON_SIZE/2.0,
subitem->alpha, subitem->alpha,
0, 0,
subitem->zoom); subitem->zoom);
lakka_draw_text("Resume", lakka_draw_text("Resume",
MARGIN_LEFT + HSPACING*(i+2) + all_categories_x + LABEL_MARGIN_LEFT, MARGIN_LEFT + HSPACING*(i+2.25) + all_categories_x + LABEL_MARGIN_LEFT,
MARGIN_TOP + subitem->y + LABEL_MARGIN_TOP, MARGIN_TOP + subitem->y + LABEL_MARGIN_TOP,
1, 1,
subitem->alpha); subitem->alpha);
@ -469,13 +448,13 @@ static void lakka_draw_subitems(int i, int j)
strcmp(g_extern.fullpath, &active_item->rom) == 0)) strcmp(g_extern.fullpath, &active_item->rom) == 0))
{ {
lakka_draw_icon(subitem->icon, lakka_draw_icon(subitem->icon,
MARGIN_LEFT + HSPACING*(i+2) + all_categories_x - ICON_SIZE/2.0, MARGIN_LEFT + HSPACING*(i+2.25) + all_categories_x - ICON_SIZE/2.0,
MARGIN_TOP + subitem->y + ICON_SIZE/2.0, MARGIN_TOP + subitem->y + ICON_SIZE/2.0,
subitem->alpha, subitem->alpha,
0, 0,
subitem->zoom); subitem->zoom);
lakka_draw_text(subitem->name, lakka_draw_text(subitem->name,
MARGIN_LEFT + HSPACING * (i+2) + all_categories_x + LABEL_MARGIN_LEFT, MARGIN_LEFT + HSPACING * (i+2.25) + all_categories_x + LABEL_MARGIN_LEFT,
MARGIN_TOP + subitem->y + LABEL_MARGIN_TOP, MARGIN_TOP + subitem->y + LABEL_MARGIN_TOP,
1, 1,
subitem->alpha); subitem->alpha);

6
frontend/menu/disp/lakka.h
View File

@ -35,10 +35,10 @@ extern float C_ACTIVE_ZOOM;
extern float C_PASSIVE_ZOOM; extern float C_PASSIVE_ZOOM;
extern float I_ACTIVE_ZOOM; extern float I_ACTIVE_ZOOM;
extern float I_PASSIVE_ZOOM; extern float I_PASSIVE_ZOOM;
extern int ABOVE_SUBITEM_OFFSET; extern float ABOVE_SUBITEM_OFFSET;
extern int ABOVE_ITEM_OFFSET; extern float ABOVE_ITEM_OFFSET;
extern float ACTIVE_ITEM_FACTOR; extern float ACTIVE_ITEM_FACTOR;
extern int UNDER_ITEM_OFFSET; extern float UNDER_ITEM_OFFSET;
typedef struct typedef struct
{ {