general imgui improvements & tabs

[vg.git] / vg_console.h

diff --git a/vg_console.h b/vg_console.h
index a38a64d6eafd3431839e9a8f892eebe71afe2591..25bad63d3c37186534f201ae40dceaed5876ad76 100644 (file)
--- a/vg_console.h
+++ b/vg_console.h
@@ -682,7 +682,7 @@ VG_STATIC void _vg_console_draw(void)
    SDL_AtomicLock( &log_print_sl );
 
        int ptr = vg_log.log_line_current;
-   int const fh = 14, log_lines = 32;
+   int const fh = vg_ui.font->line_height, log_lines = 32;
    int console_lines = VG_MIN( log_lines, vg_log.log_line_count );
 
    ui_rect rect_log   = { 0, 0,                vg.window_x, log_lines*fh },
@@ -716,7 +716,8 @@ VG_STATIC void _vg_console_draw(void)
       .change = _vg_console_on_update,
       .enter = _vg_console_on_enter
    };
-   ui_textbox( rect_input, vg_console.input, vg_list_size(vg_console.input),
+   ui_textbox( rect_input, NULL, 
+               vg_console.input, vg_list_size(vg_console.input), 1,
                UI_TEXTBOX_AUTOFOCUS, &callbacks );
 
    /* 
@@ -726,9 +727,9 @@ VG_STATIC void _vg_console_draw(void)
       ui_rect rect_suggest;
       rect_copy( rect_input, rect_suggest );
 
-      rect_suggest[0] += 6 + UI_GLYPH_SPACING_X*vg_console.suggestion_pastepos;
+      rect_suggest[0] += 6 + vg_ui.font->spacing*vg_console.suggestion_pastepos;
       rect_suggest[1] += rect_input[3];
-      rect_suggest[2]  = UI_GLYPH_SPACING_X * vg_console.suggestion_maxlen;
+      rect_suggest[2]  = vg_ui.font->spacing * vg_console.suggestion_maxlen;
       rect_suggest[3]  = vg_console.suggestion_count * fh;
 
       ui_fill( rect_suggest, bg_colour );