From f195708420b7312fda106a9e7daf0c8ae77a62d7 Mon Sep 17 00:00:00 2001 From: hgn Date: Tue, 5 Sep 2023 20:26:03 +0100 Subject: [PATCH] update imgui api changes --- skaterift_imgui_dev.c | 14 ++++++++++++-- workshop.c | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/skaterift_imgui_dev.c b/skaterift_imgui_dev.c index 6247b82..53fcccc 100644 --- a/skaterift_imgui_dev.c +++ b/skaterift_imgui_dev.c @@ -83,6 +83,13 @@ VG_STATIC void vg_render(void){ vg_lines_drawall(); } +static struct ui_enum_opt dropdown_options[] = { + { 0, "Zero" }, + { 3, "Three" }, + { -1, "Minus One" } +}; +static i32 dropdown_value = 8; + VG_STATIC void vg_gui(void){ if( !skaterift_loaded ) return; @@ -99,7 +106,10 @@ VG_STATIC void vg_gui(void){ ui_rect panel; if( vgi_window( window, "Test window", k_vgi_window_standard, panel ) ){ - + ui_rect tmp; + ui_split( panel, k_ui_axis_h, k_vgi_widget_height*k_vgi_scale, + 0, tmp, panel ); + ui_enum( tmp, "Select enum:", dropdown_options, 3, &dropdown_value ); } else{ /* window close */ @@ -117,7 +127,7 @@ VG_STATIC void vg_gui(void){ ui_rect quit_button; ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button ); - if( ui_button_text( quit_button, "x", 1 ) ){ + if( ui_button_text( quit_button, "x", 1 ) == 1 ){ ui_start_modal( g_an_buffer, UI_MODAL_GOOD ); } diff --git a/workshop.c b/workshop.c index 6b7416f..11ec276 100644 --- a/workshop.c +++ b/workshop.c @@ -1072,7 +1072,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ if( workshop_form.submission.submission_type_selection.value != k_addon_type_none ){ - if( ui_button_text( button_l, "OK", 1 ) ){ + if( ui_button_text( button_l, "OK", 1 ) == 1 ){ enum addon_type type = workshop_form.submission.submission_type_selection.value; workshop_form.submission.type = type; @@ -1089,7 +1089,7 @@ VG_STATIC void workshop_form_gui_page_undecided( ui_rect content ){ ui_colour(k_ui_bg+4) ); } - if( ui_button_text( button_r, "Cancel", 1 ) ){ + if( ui_button_text( button_r, "Cancel", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; workshop_form.file_intent = k_workshop_form_file_intent_none; } @@ -1202,7 +1202,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_text( file_entry, workshop_form.addon_folder, 1, k_ui_align_middle_left, ui_colour( k_ui_fg+4 ) ); - if( ui_button_text( file_button, "Remove", 1 ) ){ + if( ui_button_text( file_button, "Remove", 1 ) == 1 ){ if( type == k_addon_type_board ) player_board_unload( &workshop_form.board_model ); else if( type == k_addon_type_player ) @@ -1220,7 +1220,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_textbox( file_entry, workshop_form.addon_folder, vg_list_size(workshop_form.addon_folder), 0, &callbacks ); - if( ui_button_text( file_button, "Load", 1 ) ){ + if( ui_button_text( file_button, "Load", 1 ) == 1 ){ workshop_op_load_model(); } } @@ -1284,10 +1284,10 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_split_ratio( submission_center, k_ui_axis_v, 0.5f, 8, btn_left, btn_right ); - if( ui_button_text( btn_left, "Publish", 1 ) ){ + if( ui_button_text( btn_left, "Publish", 1 ) == 1 ){ workshop_op_submit(); } - if( ui_button_text( btn_right, "Cancel", 1 ) ){ + if( ui_button_text( btn_right, "Cancel", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; player_board_unload( &workshop_form.board_model ); workshop_form.file_intent = k_workshop_form_file_intent_none; @@ -1311,7 +1311,7 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){ ui_split( inner, k_ui_axis_v, inner[2]-btn_width, 0, label, btn_right); ui_rect_pad( btn_right, (ui_px[2]){2,2} ); - if( ui_button_text( btn_right, "\xbf", 2 ) ){ + if( ui_button_text( btn_right, "\xbf", 2 ) == 1 ){ ISteamFriends *hSteamFriends = SteamAPI_SteamFriends(); SteamAPI_ISteamFriends_ActivateGameOverlayToWebPage( hSteamFriends, "https://steamcommunity.com/sharedfiles/workshoplegalagreement", @@ -1384,15 +1384,15 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect 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( btn_left, "newer", 1 ) ){ + if( ui_button_text( btn_left, "newer", 1 ) == 1 ){ workshop_view_page( workshop_form.view_published_page_id-1 ); } - if( ui_button_text( btn_right, "older", 1 ) ){ + if( ui_button_text( btn_right, "older", 1 ) == 1 ){ workshop_view_page( workshop_form.view_published_page_count+1 ); } - if( ui_button_text( btn_create_new, "Create New Item", 1 ) ){ + if( ui_button_text( btn_create_new, "Create New Item", 1 ) == 1 ){ workshop_reset_submission_data(); workshop_form.submission.submit_title = 1; workshop_form.submission.submit_description = 1; @@ -1406,7 +1406,7 @@ VG_STATIC void workshop_form_gui_sidebar( ui_rect sidebar ) ui_rect_pad( item, (ui_px[2]){4,4} ); struct published_file *pfile = &workshop_form.published_files_list[i]; - if( ui_button_text( item, pfile->title, 1 ) ){ + if( ui_button_text( item, pfile->title, 1 ) == 1 ){ if( pfile->result == k_EResultOK ){ vg_info( "Select index: %d\n", pfile->result_index ); workshop_op_download_and_view_submission( pfile->result_index ); @@ -1442,7 +1442,7 @@ VG_STATIC void workshop_form_gui(void) ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button ); if( vg_loader_availible() ){ - if( ui_button_text( quit_button, "X", 1 ) ){ + if( ui_button_text( quit_button, "X", 1 ) == 1 ){ workshop_quit_form(); return; } @@ -1533,7 +1533,7 @@ VG_STATIC void workshop_form_gui(void) ui_rect_center( submission_row, submission_center ); ui_rect_pad( submission_center, (ui_px[2]){8,8} ); - if( ui_button_text( submission_center, "OK", 1 ) ){ + if( ui_button_text( submission_center, "OK", 1 ) == 1 ){ workshop_form.page = k_workshop_form_open; } } -- 2.25.1