From d043e7ab9cac90df65d806c02f79756076a377cb Mon Sep 17 00:00:00 2001 From: hgn Date: Mon, 1 May 2023 03:21:46 +0100 Subject: [PATCH 1/1] textboxes start --- skaterift.c | 2 +- skaterift_imgui_dev.c | 74 +++++++++++++++++++++---------------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/skaterift.c b/skaterift.c index 2879ef9..c29d876 100644 --- a/skaterift.c +++ b/skaterift.c @@ -476,7 +476,7 @@ VG_STATIC void vg_render(void) gui_draw(); } -VG_STATIC void vg_ui(void) +VG_STATIC void vg_gui(void) { if( skaterift_status == 0 ){ return; diff --git a/skaterift_imgui_dev.c b/skaterift_imgui_dev.c index 2f1ca57..b751796 100644 --- a/skaterift_imgui_dev.c +++ b/skaterift_imgui_dev.c @@ -98,40 +98,56 @@ VG_STATIC void vg_render(void) vg_lines_drawall(); } -VG_STATIC void vg_ui(void) +struct workshop_form{ + char title[80]; + char description[512]; +} +static form_test; + +VG_STATIC void vg_gui(void) { if( !skaterift_loaded ) return; ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; - v4f btn_basic = { 0.8f,0.8f,0.8f,1.0f }; - ui_rect window = { 0, 0, 1200, 800 }; ui_rect_center( screen, window ); { - ui_fill( window, 0xff111111 ); - ui_outline( window, 1, 0xffffffff ); + ui_fill( window, ui_colour( k_ui_bg+1 ) ); + ui_outline( window, 1, ui_colour( k_ui_bg+7 ) ); ui_rect title, panel; ui_split_px( window, k_ui_axis_h, 28, 0, title, panel ); - ui_fill( title, 0xff333333 ); - ui_text( title, "Workshop tool", 2, k_ui_align_center ); + ui_fill( title, ui_colour( k_ui_bg+7 ) ); + ui_text( title, KBLK "Workshop tool", 1, k_ui_align_middle_center ); ui_rect sidebar, content; ui_split_ratio( panel, k_ui_axis_v, 0.25f, 1, sidebar, content ); /* entries panel */ - ui_fill( sidebar, 0xff222222 ); + ui_fill( sidebar, ui_colour( k_ui_bg+2 ) ); ui_split_px( sidebar, k_ui_axis_h, 28, 0, title, sidebar ); ui_text( title, "Your submissions", 1, k_ui_align_middle_center ); + ui_rect controls; + ui_split_px( sidebar, k_ui_axis_h, 28, 0, controls, sidebar ); + ui_fill( controls, ui_colour( k_ui_bg+1 ) ); + ui_outline( controls, -1, ui_colour( k_ui_bg+4 ) ); + + ui_rect info; + ui_split_ratio( controls, k_ui_axis_v, 0.25f, 0, info, controls ); + ui_text( info, "page 0/2", 1, k_ui_align_middle_center ); - ui_rect up_button; - ui_split_px( sidebar, k_ui_axis_h, 48, 0, up_button, sidebar ); + ui_rect btn_left, btn_right; + ui_split_ratio( controls, k_ui_axis_v, 0.5f, 2, btn_left, btn_right ); - if( ui_button_text( up_button, "^", 2, btn_basic ) ){ - vg_info( "page up\n" ); + if( ui_button_text( btn_left, "prev", 1, k_ui_bg+4 ) ){ + vg_info( "left\n" ); + } + + if( ui_button_text( btn_right, "next", 1, k_ui_bg+4 ) ){ + vg_info( "right\n" ); } /* content page */ @@ -139,36 +155,20 @@ VG_STATIC void vg_ui(void) ui_rect image_plane; ui_split_px( content, k_ui_axis_h, 300, 0, image_plane, content ); - ui_fill( image_plane, 0xff000000 ); + ui_fill( image_plane, ui_colour( k_ui_bg+0 ) ); ui_rect img_box; ui_fit_item( image_plane, (ui_px[2]){ 3, 2 }, img_box ); ui_image( img_box, tex_error ); - ui_text( content, "rest of the stuff", 1, k_ui_align_left ); - } - -#if 0 - ui_box box = { 200, 100, 600, 400 };{ - ui_fill( box, 0xff0000aa ); - ui_outline( box, 1, 0xffffffff ); - - ui_split split = ui_split_ratio( box, k_ui_axis_v, 0.25f, 8 );{ - if( ui_mouseover_rect( split.l.rect ) ) ui_fill( split.l, 0xff00aa00 ); - else ui_fill( split.l, 0xffaa0000 ); - - ui_text( split.l.rect, "Hello world!\n" - "adwjdiwadjwidwjidiadjw\n" - "eeeee", 1, k_ui_align_center ); - }{ - ui_fill( split.r, 0xff002000 ); - split = ui_split_ratio( split.r, k_ui_axis_h, 0.5f, 1 ); - - ui_box img_box = ui_fit_item( split.t, (ui_px[2]){ 30,20 } ); - ui_image( img_box.rect, tex_error ); + ui_rect title_entry, null, label; + ui_split_px( content, k_ui_axis_h, 8, 0, null, content ); + + ui_split_px( content, k_ui_axis_h, 28, 0, title_entry, content ); + ui_split_px( title_entry, k_ui_axis_v, + ui_text_line_width("Title:")+8, 0, label, title_entry ); - ui_fill( split.b, 0xff00ff00 ); - } + ui_text( label, "Title:", 1, k_ui_align_middle_left ); + ui_textbox( title_entry, form_test.title, vg_list_size(form_test.title) ); } -#endif } -- 2.25.1