v2.2 (and like always, transfer unmerged PRs)

This commit is contained in:
Kostas Missos
2018-06-03 09:37:37 +03:00
parent d4103efaa9
commit 9be1a36e79
6 changed files with 818 additions and 28 deletions

View File

@@ -17,6 +17,8 @@
#include "tui.h"
#include "btn.h"
extern u8 *Kc_HEKATE_LOGO;
void tui_pbar(gfx_con_t *con, int x, int y, u32 val, u32 fgcol, u32 bgcol)
{
u32 cx, cy;
@@ -27,9 +29,9 @@ void tui_pbar(gfx_con_t *con, int x, int y, u32 val, u32 fgcol, u32 bgcol)
gfx_printf(con, "%k[%3d%%]%k", fgcol, val, 0xFFCCCCCC);
x += 7 * 8;
x += 7 * con->fntsz;
for (int i = 0; i < 6; i++)
for (int i = 0; i < con->fontmult * 6; i++)
{
gfx_line(con->gfx_ctxt, x, y + i + 1, x + 3 * val, y + i + 1, fgcol);
gfx_line(con->gfx_ctxt, x + 3 * val, y + i + 1, x + 3 * 100, y + i + 1, bgcol);
@@ -44,6 +46,7 @@ void *tui_do_menu(gfx_con_t *con, menu_t *menu)
int prev_idx = 0;
gfx_clear(con->gfx_ctxt, 0xFF1B1B1B);
gfx_set_logo(con->gfx_ctxt, Kc_HEKATE_LOGO);
while (1)
{
@@ -124,7 +127,9 @@ void *tui_do_menu(gfx_con_t *con, menu_t *menu)
default:
break;
}
gfx_con_setfontsz(con, 16);
gfx_clear(con->gfx_ctxt, 0xFF1B1B1B);
gfx_set_logo(con->gfx_ctxt, Kc_HEKATE_LOGO);
}
}