small updates and api changes

[carveJwlIkooP6JGAAIwe30JlM.git] / workshop.c

diff --git a/workshop.c b/workshop.c
index 341d44a3f0d64bcd5b4e839b22f5e60c17ec1120..1414fc634b8864b5d2297ab5541a67704f8d8e46 100644 (file)
--- a/workshop.c
+++ b/workshop.c
@@ -1158,25 +1158,24 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
    workshop_form_gui_draw_preview( img_box );
 
    /* file path */
-   ui_rect null, file_entry, file_button, file_label;
-   ui_split( content, k_ui_axis_h, 8, 0, null, content );
-   ui_split( content, k_ui_axis_h, 28, 0, file_entry, content );
+   ui_rect file_button, file_label;
 
    char buf[128];
-   snprintf( buf, 128, "Addon folder: skaterift/%s", 
-               workshop_filetype_folder() );
-
-   ui_label( file_entry, buf, 1, 8, file_entry );
+   snprintf( buf, 128, 
+             "Addon folder: skaterift/%s", workshop_filetype_folder() );
 
    if( type == k_addon_type_world ){
       struct ui_textbox_callbacks callbacks = {
          .change = workshop_changed_model_path
       };
-      ui_textbox( file_entry, workshop_form.addon_folder,
-                  vg_list_size(workshop_form.addon_folder), 0, &callbacks );
+      ui_textbox( content, buf, workshop_form.addon_folder,
+                  vg_list_size(workshop_form.addon_folder), 1, 0, &callbacks );
    }
    else{
+      ui_rect file_entry;
+      ui_standard_widget( content, file_entry, 1 );
       ui_split( file_entry, k_ui_axis_v, -128, 0, file_entry, file_button );
+
       if( workshop_form.file_intent != k_workshop_form_file_intent_none ){
          ui_text( file_entry, workshop_form.addon_folder, 1, 
                   k_ui_align_middle_left, ui_colour( k_ui_fg+4 ) );
@@ -1196,8 +1195,9 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
             .change = workshop_changed_model_path
          };
 
-         ui_textbox( file_entry, workshop_form.addon_folder,
-                     vg_list_size(workshop_form.addon_folder), 0, &callbacks );
+         ui_textbox( file_entry, buf, workshop_form.addon_folder,
+                     vg_list_size(workshop_form.addon_folder), 1,
+                     0, &callbacks );
 
          if( ui_button_text( file_button, "Load", 1 ) == 1 ){
             workshop_op_load_model();
@@ -1205,31 +1205,21 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
       }
    }
 
-   ui_rect title_entry, label;
-   ui_split( content, k_ui_axis_h, 8, 0, null, content );
-   ui_split( content, k_ui_axis_h, 28, 0, title_entry, content );
-
    const char *str_title = "Title:", *str_desc = "Description:";
-   ui_split( title_entry, k_ui_axis_v, 
-                ui_text_line_width(str_title)+8, 0, label, title_entry );
-
-   ui_rect vis_enum;
-   ui_split_ratio( title_entry, k_ui_axis_v, 0.6f, 16, 
-                   title_entry, vis_enum );
 
    /* title box */
    {
       struct ui_textbox_callbacks callbacks = {
          .change = workshop_changed_title
       };
-      ui_text( label, str_title, 1, k_ui_align_middle_left, 0 );
-      ui_textbox( title_entry, workshop_form.submission.title, 
-                  vg_list_size(workshop_form.submission.title), 0, &callbacks );
+      ui_textbox( content, str_title, workshop_form.submission.title, 
+                  vg_list_size(workshop_form.submission.title), 1,
+                  0, &callbacks );
    }
 
    /* visibility option */
    {
-      ui_enum( vis_enum, "Visibility:", workshop_form_visibility_opts,
+      ui_enum( content, "Visibility:", workshop_form_visibility_opts,
                4, &workshop_form.submission.visibility );
    }
 
@@ -1238,26 +1228,19 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
       struct ui_textbox_callbacks callbacks = {
          .change = workshop_changed_description
       };
-      ui_rect desc_entry;
-      ui_split( content, k_ui_axis_h, 8, 0, null, content );
-      ui_split( content, k_ui_axis_h, 28, 0, label, content );
-      ui_split( content, k_ui_axis_h, 28*4, 0, desc_entry, content );
-      ui_text( label, str_desc, 1, k_ui_align_middle_left, 0 );
-      ui_textbox( desc_entry, workshop_form.submission.description,
-                  vg_list_size(workshop_form.submission.description), 
-                     UI_TEXTBOX_MULTILINE|UI_TEXTBOX_WRAP, &callbacks );
+      ui_textbox( content, str_desc, workshop_form.submission.description,
+                  vg_list_size(workshop_form.submission.description), 4,
+                  UI_TEXTBOX_MULTILINE|UI_TEXTBOX_WRAP, &callbacks );
    }
 
    /* submissionable */
-   ui_rect submission_row;
-   ui_split( content, k_ui_axis_h, 8, 0, null, content );
-   ui_split( content, k_ui_axis_h, content[3]-32-8, 0, content, 
-                submission_row  );
+   ui_rect final_row;
+   ui_split( content, k_ui_axis_h, content[3]-32-8, 0, content, final_row );
 
    ui_rect submission_center;
-   rect_copy( submission_row, submission_center );
+   rect_copy( final_row, submission_center );
    submission_center[2] = 256;
-   ui_rect_center( submission_row, submission_center );
+   ui_rect_center( final_row, submission_center );
 
    ui_rect btn_left, btn_right;
    ui_split_ratio( submission_center, k_ui_axis_v, 0.5f, 8, 
@@ -1277,15 +1260,14 @@ VG_STATIC void workshop_form_gui_edit_page( ui_rect content ){
       "By submitting this item, you agree to the workshop terms of service";
 
    ui_rect disclaimer_row, inner, link;
-   ui_split( content, k_ui_axis_h, 8, 0, null, content );
-   ui_split( content, k_ui_axis_h, content[3]-32, 0, content, 
-                disclaimer_row );
+   ui_split( content, k_ui_axis_h, content[3]-32, 0, content, disclaimer_row );
 
    ui_px btn_width = 32;
 
    rect_copy( disclaimer_row, inner );
    inner[2] = ui_text_line_width( disclaimer_text ) + btn_width+8;
 
+   ui_rect label;
    ui_rect_center( disclaimer_row, inner );
    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} );
@@ -1409,7 +1391,7 @@ VG_STATIC void workshop_form_gui(void)
    vg_ui.wants_mouse = 1;
 
    ui_fill( window, ui_colour( k_ui_bg+1 ) );
-   ui_outline( window, 1, ui_colour( k_ui_bg+7 ) );
+   ui_outline( window, 1, ui_colour( k_ui_bg+7 ), 0 );
 
    ui_rect title, panel;
    ui_split( window, k_ui_axis_h, 28, 0, title, panel );