diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index c62e9b92fb..de5cf5f4bd 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -322,7 +322,7 @@ static bool zarch_zui_button_full(zui_t *zui, if (zui->item.active == id || zui->item.hot == id) bg = zui_bg_hilite; - menu_display_push_quad(zui->width, zui->height, bg, &zui->ca, x1, y1, x2, y2); + menu_display_push_quad(&zui->ca, zui->width, zui->height, bg, x1, y1, x2, y2); zarch_zui_draw_text(zui, ZUI_FG_NORMAL, x1+12, y1 + 41, label); return active; @@ -378,7 +378,7 @@ static bool zarch_zui_list_item(zui_t *zui, struct zui_tabbed *tab, int x1, int menu_animation_ctl(MENU_ANIMATION_CTL_TICKER, &ticker); - menu_display_push_quad(zui->width, zui->height, bg, &zui->ca, x1, y1, x2, y2); + menu_display_push_quad(&zui->ca, zui->width, zui->height, bg, x1, y1, x2, y2); zarch_zui_draw_text(zui, ZUI_FG_NORMAL, 12, y1 + 35, title_buf); if (entry) @@ -437,7 +437,7 @@ static bool zarch_zui_tab(zui_t *zui, struct zui_tabbed *tab, else if (selected) bg = zui_bg_pad_hilite; - menu_display_push_quad(zui->width, zui->height, bg, &zui->ca, x1+0, y1+0, x2, y2); + menu_display_push_quad(&zui->ca, zui->width, zui->height, bg, x1+0, y1+0, x2, y2); zarch_zui_draw_text(zui, ZUI_FG_NORMAL, x1+12, y1 + 41, label); if (tab->vertical) @@ -762,8 +762,8 @@ static int zarch_zui_render_lay_root(zui_t *zui) zarch_zui_draw_text(zui, ZUI_FG_NORMAL, 1600 +12, 300 + 111, item); #endif - menu_display_push_quad(zui->width, zui->height, - zui_bg_hilite, &zui->ca, 0, 60, zui->width - 290 - 40, 60+4); + menu_display_push_quad(&zui->ca, zui->width, zui->height, + zui_bg_hilite, 0, 60, zui->width - 290 - 40, 60+4); return 0; } @@ -907,8 +907,8 @@ static void zarch_frame(void *data) menu_display_ctl(MENU_DISPLAY_CTL_FONT_BIND_BLOCK, &zui->tmp_block); - menu_display_push_quad(zui->width, zui->height, zui_bg_screen, - &zui->ca, 0, 0, zui->width, zui->height); + menu_display_push_quad(&zui->ca, zui->width, zui->height, zui_bg_screen, + 0, 0, zui->width, zui->height); menu_display_snow(&zui->ca, zui->width, zui->height); switch (zarch_layout) diff --git a/menu/menu_display.c b/menu/menu_display.c index 669174aec1..eae44c4127 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -604,8 +604,9 @@ static INLINE float menu_display_randf(float min, float max) } -void menu_display_push_quad(unsigned width, unsigned height, - const float *colors, gfx_coord_array_t *ca, int x1, int y1, +void menu_display_push_quad(gfx_coord_array_t *ca, + unsigned width, unsigned height, + const float *colors, int x1, int y1, int x2, int y2) { menu_display_ctx_coord_draw_t coord_draw; @@ -721,8 +722,8 @@ void menu_display_snow(gfx_coord_array_t *ca, int width, int height) colors[j] = alpha; } - menu_display_push_quad(width, height, - colors, ca, p->x-2, p->y-2, p->x+2, p->y+2); + menu_display_push_quad(ca, width, height, + colors, p->x-2, p->y-2, p->x+2, p->y+2); j++; } diff --git a/menu/menu_display.h b/menu/menu_display.h index f674463436..42354fd664 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -174,8 +174,9 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data); void menu_display_handle_wallpaper_upload(void *task_data, void *user_data, const char *err); -void menu_display_push_quad(unsigned width, unsigned height, - const float *colors, gfx_coord_array_t *ca, int x1, int y1, +void menu_display_push_quad(gfx_coord_array_t *ca, + unsigned width, unsigned height, + const float *colors, int x1, int y1, int x2, int y2); void menu_display_snow(gfx_coord_array_t *ca, int width, int height);