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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-09 05:07:36 +01:00
parent e7798ed511
commit 07632702fb
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/menu_display.c
View File

@ -95,19 +95,24 @@ static void menu_display_timedate(void *data)
switch (datetime->time_mode) switch (datetime->time_mode)
{ {
case 0: /* Date and time */ case 0: /* Date and time */
strftime(datetime->s, datetime->len, "%Y-%m-%d %H:%M:%S", localtime(&time_)); strftime(datetime->s, datetime->len,
"%Y-%m-%d %H:%M:%S", localtime(&time_));
break; break;
case 1: /* Date */ case 1: /* Date */
strftime(datetime->s, datetime->len, "%Y-%m-%d", localtime(&time_)); strftime(datetime->s, datetime->len,
"%Y-%m-%d", localtime(&time_));
break; break;
case 2: /* Time */ case 2: /* Time */
strftime(datetime->s, datetime->len, "%H:%M:%S", localtime(&time_)); strftime(datetime->s, datetime->len,
"%H:%M:%S", localtime(&time_));
break; break;
case 3: /* Time (hours-minutes) */ case 3: /* Time (hours-minutes) */
strftime(datetime->s, datetime->len, "%H:%M", localtime(&time_)); strftime(datetime->s, datetime->len,
"%H:%M", localtime(&time_));
break; break;
case 4: /* Date and time, without year and seconds */ case 4: /* Date and time, without year and seconds */
strftime(datetime->s, datetime->len, "%d/%m %H:%M", localtime(&time_)); strftime(datetime->s, datetime->len,
"%d/%m %H:%M", localtime(&time_));
break; break;
} }
} }
@ -461,7 +466,8 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
if (!menu_disp || !menu_disp->draw || !data) if (!menu_disp || !menu_disp->draw || !data)
return false; return false;
menu_disp->draw(draw->x, draw->y, draw->width, draw->height, menu_disp->draw(draw->x, draw->y, draw->width, draw->height,
draw->coords, draw->matrix_data, draw->texture, draw->prim_type); draw->coords, draw->matrix_data,
draw->texture, draw->prim_type);
} }
break; break;
case MENU_DISPLAY_CTL_DRAW_BG: case MENU_DISPLAY_CTL_DRAW_BG:
@ -481,7 +487,9 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
{ {
math_matrix_4x4 matrix_rotated, matrix_scaled; math_matrix_4x4 matrix_rotated, matrix_scaled;
math_matrix_4x4 *b = NULL; math_matrix_4x4 *b = NULL;
menu_display_ctx_rotate_draw_t *draw = (menu_display_ctx_rotate_draw_t*)data; menu_display_ctx_rotate_draw_t *draw =
(menu_display_ctx_rotate_draw_t*)data;
if (!draw || !menu_disp || !menu_disp->get_default_mvp) if (!draw || !menu_disp || !menu_disp->get_default_mvp)
return false; return false;
@ -493,13 +501,15 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
if (!draw->scale_enable) if (!draw->scale_enable)
return false; return false;
matrix_4x4_scale(&matrix_scaled, draw->scale_x, draw->scale_y, draw->scale_z); matrix_4x4_scale(&matrix_scaled,
draw->scale_x, draw->scale_y, draw->scale_z);
matrix_4x4_multiply(draw->matrix, &matrix_scaled, draw->matrix); matrix_4x4_multiply(draw->matrix, &matrix_scaled, draw->matrix);
} }
break; break;
case MENU_DISPLAY_CTL_TEX_COORDS_GET: case MENU_DISPLAY_CTL_TEX_COORDS_GET:
{ {
menu_display_ctx_coord_draw_t *draw = (menu_display_ctx_coord_draw_t*)data; menu_display_ctx_coord_draw_t *draw =
(menu_display_ctx_coord_draw_t*)data;
if (!draw) if (!draw)
return false; return false;
@ -520,7 +530,6 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
return true; return true;
} }
void menu_display_handle_wallpaper_upload(void *task_data, void menu_display_handle_wallpaper_upload(void *task_data,
void *user_data, const char *err) void *user_data, const char *err)
{ {