From 245a716a607eeed6e7d11f4bb3d9e0f643be1a8e Mon Sep 17 00:00:00 2001 From: hgn Date: Thu, 14 Oct 2021 14:22:43 +0100 Subject: [PATCH] minor ui tweaks --- vg/vg_ui.h | 119 +++++++++++++++++++++++++++++------------------------ 1 file changed, 66 insertions(+), 53 deletions(-) diff --git a/vg/vg_ui.h b/vg/vg_ui.h index a9bea2e..4d54a6d 100644 --- a/vg/vg_ui.h +++ b/vg/vg_ui.h @@ -229,7 +229,7 @@ static void ui_rect_copy( ui_rect src, ui_rect dst ) dst[3] = src[3]; } -static void ui_rect_pad( ui_ctx *ctx, ui_rect rect, ui_px pad ) +static void ui_rect_pad( ui_rect rect, ui_px pad ) { rect[0] += pad; rect[1] += pad; @@ -304,6 +304,12 @@ static void ui_end_right( ui_ctx *ctx ) ctx->cursor[0] += width; } +static void ui_fill_y( ui_ctx *ctx ) +{ + struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; + ctx->cursor[3] = node->rect[3] - (ctx->cursor[1]-node->rect[1]); +} + static void ui_align_right( ui_ctx *ctx ) { struct ui_qnode *node = &ctx->stack[ ctx->stack_count-1 ]; @@ -342,12 +348,8 @@ static void ui_capture_mouse( ui_ctx *ctx, u32 id ) } } -static void ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour ) +static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, ui_px uv[4] ) { - ui_px uv[2]; - uv[0] = 66; - uv[1] = 66; - struct ui_vert *vertices = &ctx->verts[ ctx->num_verts ]; vertices[0].co[0] = rect[0]; vertices[0].co[1] = rect[1]; @@ -356,18 +358,18 @@ static void ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour ) vertices[0].colour = colour; vertices[1].co[0] = rect[0]+rect[2]; vertices[1].co[1] = rect[1]; - vertices[1].uv[0] = uv[0]; + vertices[1].uv[0] = uv[2]; vertices[1].uv[1] = uv[1]; vertices[1].colour = colour; vertices[2].co[0] = rect[0]+rect[2]; vertices[2].co[1] = rect[1]+rect[3]; - vertices[2].uv[0] = uv[0]; - vertices[2].uv[1] = uv[1]; + vertices[2].uv[0] = uv[2]; + vertices[2].uv[1] = uv[3]; vertices[2].colour = colour; vertices[3].co[0] = rect[0]; vertices[3].co[1] = rect[1]+rect[3]; vertices[3].uv[0] = uv[0]; - vertices[3].uv[1] = uv[1]; + vertices[3].uv[1] = uv[3]; vertices[3].colour = colour; u16 ind_start = ctx->num_verts; u16 *indices = &ctx->indices[ ctx->num_indices ]; @@ -382,6 +384,13 @@ static void ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour ) ctx->num_indices += 6; ctx->num_verts += 4; + + return vertices; +} + +static struct ui_vert *ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour ) +{ + return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 66, 66, 66, 66 } ); } static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment ) @@ -413,45 +422,7 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment ) glyph_base[0] *= 7; glyph_base[1] *= 7; - - struct ui_vert *vertices = &ctx->verts[ctx->num_verts]; - vertices[0].co[0] = text_cursor[0]; - vertices[0].co[1] = text_cursor[1]; - vertices[0].uv[0] = glyph_base[0]; - vertices[0].uv[1] = glyph_base[1]; - vertices[0].colour = 0xffffffff; - - vertices[1].co[0] = text_cursor[0]+text_cursor[2]; - vertices[1].co[1] = text_cursor[1]; - vertices[1].uv[0] = glyph_base[0]+7; - vertices[1].uv[1] = glyph_base[1]; - vertices[1].colour = 0xffffffff; - - vertices[2].co[0] = text_cursor[0]+text_cursor[2]; - vertices[2].co[1] = text_cursor[1]+text_cursor[3]; - vertices[2].uv[0] = glyph_base[0]+7; - vertices[2].uv[1] = glyph_base[1]+7; - vertices[2].colour = 0xffffffff; - - vertices[3].co[0] = text_cursor[0]; - vertices[3].co[1] = text_cursor[1]+text_cursor[3]; - vertices[3].uv[0] = glyph_base[0]; - vertices[3].uv[1] = glyph_base[1]+7; - vertices[3].colour = 0xffffffff; - - u16 ind_start = ctx->num_verts; - u16 *indices = &ctx->indices[ ctx->num_indices ]; - - indices[0] = ind_start+0; - indices[1] = ind_start+2; - indices[2] = ind_start+1; - - indices[3] = ind_start+0; - indices[4] = ind_start+3; - indices[5] = ind_start+2; - - ctx->num_indices += 6; - ctx->num_verts += 4; + ui_fill_rect_uv( ctx, text_cursor, 0xffffffff, (ui_px[4]){glyph_base[0],glyph_base[1],glyph_base[0]+7,glyph_base[1]+7} ); } text_cursor[0] += 6*scale; @@ -519,6 +490,8 @@ static int ui_button( ui_ctx *ctx, u32 id ) if( ui_hasmouse(ctx) ) { + ui_fill_rect( ctx, ctx->cursor, 0xffcccccc ); + if( ctx->click_state == 1 ) ctx->capture_lock = 1; else if( ctx->capture_lock && ctx->click_state == 3 ) @@ -526,6 +499,8 @@ static int ui_button( ui_ctx *ctx, u32 id ) return 1; } } + else + ui_fill_rect( ctx, ctx->cursor, 0xff999999 ); } return 0; @@ -554,7 +529,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) { ui_capture_mouse( ctx, __COUNTER__ ); - ui_fill_rect( ctx, ctx->cursor, 0xff333333 ); + //ui_fill_rect( ctx, ctx->cursor, 0xff333333 ); // Drag bar ctx->cursor[3] = 25; @@ -562,7 +537,7 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) { ui_capture_mouse( ctx, __COUNTER__ ); - ui_fill_rect( ctx, ctx->cursor, 0xff555555 ); + struct ui_vert *drag_bar = ui_fill_rect( ctx, ctx->cursor, 0xff555555 ); // title.. ctx->cursor[0] += 2; @@ -574,16 +549,23 @@ static int ui_window( ui_ctx *ctx, struct ui_window *window, u32 control_group ) ctx->cursor[2] = 25; ui_align_right( ctx ); ui_align_top( ctx ); - ui_rect_pad( ctx, ctx->cursor, 4 ); + ui_rect_pad( ctx->cursor, 4 ); if( ui_button( ctx, __COUNTER__ ) ) { vg_info( "Click clacked\n" ); } + ctx->cursor[0] += 2; + ui_text( ctx, "x", 2, 0 ); ui_end( ctx ); if( ui_hasmouse( ctx ) ) { + drag_bar[0].colour = 0xff777777; + drag_bar[1].colour = 0xff777777; + drag_bar[2].colour = 0xff777777; + drag_bar[3].colour = 0xff777777; + // start drag if( ctx->click_state == 1 ) { @@ -652,7 +634,38 @@ static void ui_test(void) if( ui_window( &test_ctx, &window, __COUNTER__ ) ) { // Contents - ui_text( &test_ctx, "Just say anything, George, say what ever's natural,\nthe first thing that comes to your mind.\nTake that you mutated son-of-a-bitch.", 1, 0 ); + //ui_text( &test_ctx, "A slice of heaven. O for awesome, this chocka \nfull cuzzie is as rip-off as a cracker.\nMeanwhile, in behind the bicycle shed, Hercules Morse,\nas big as a horse and Mrs Falani were up to no \ngood with a bunch of crook pikelets. Meanwhile, \nat the black singlet woolshed party, not even au,\nsort your drinking out.", 1, 0 ); + test_ctx.cursor[2] = 75; + ui_fill_y( &test_ctx ); + + ui_new_node( &test_ctx ); + { + test_ctx.cursor[3] = 75; + + if( ui_button( &test_ctx, __COUNTER__ ) ) + vg_info( "Buy\n" ); + { + ui_rect_pad( test_ctx.cursor, 4 ); + ui_text( &test_ctx, "Buy", 2, 0 ); + } + ui_end_down( &test_ctx ); + + if( ui_button( &test_ctx, __COUNTER__ ) ) + vg_info( "Sell\n" ); + { + ui_rect_pad( test_ctx.cursor, 4 ); + ui_text( &test_ctx, "Sell", 2, 0 ); + } + ui_end_down( &test_ctx ); + } + ui_end_right( &test_ctx ); + + test_ctx.cursor[2] = 200; + ui_new_node( &test_ctx ); + { + + } + ui_end_right( &test_ctx ); } ui_end( &test_ctx ); -- 2.25.1