added simple settings window

[fishladder.git] / vg / vg_console.h

diff --git a/vg/vg_console.h b/vg/vg_console.h
index 0e974f83b0223e2d87f257a0cd41b7357aa81467..558df185bae8a9086ee9531577f8c361a5ffa171 100644 (file)
--- a/vg/vg_console.h
+++ b/vg/vg_console.h
@@ -42,7 +42,7 @@ struct vg_console
        int enabled;
        int scale;
 }
-vg_console = { .scale = 1 };
+vg_console = { .scale = 2 };
 
 static int vg_console_enabled(void) { return vg_console.enabled; }
 
@@ -80,7 +80,7 @@ static void vg_console_draw( void )
                
                for( int i = 0; i < vg_console.len; i ++ )
                {
-                       ui_text( &ui_global_ctx, vg_console.lines[ptr], vg_console.scale, 0 );
+                       ui_text( &ui_global_ctx, vg_console.lines[ptr], vg_console.scale );
                        ui_global_ctx.cursor[1] -= 8*vg_console.scale;
                
                        ptr --;
@@ -97,13 +97,13 @@ static void vg_console_draw( void )
        {
                ui_fill_rect( &ui_global_ctx, ui_global_ctx.cursor, 0x77333333 );
                
-               ui_text( &ui_global_ctx, vg_console.input, vg_console.scale, 0 );
+               ui_text( &ui_global_ctx, vg_console.input, vg_console.scale );
                
                int start = VG_MIN( vg_console.cursor_pos, vg_console.cursor_user ),
                         end   = VG_MAX( vg_console.cursor_pos, vg_console.cursor_user );
                
-               ui_global_ctx.cursor[0] = start * 6 * vg_console.scale;
-               ui_global_ctx.cursor[2] = (start == end? 1: (end-start)) * 6 * vg_console.scale;
+               ui_global_ctx.cursor[0] = (start * ui_glyph_spacing_x * vg_console.scale) + 2;
+               ui_global_ctx.cursor[2] = (start == end? 0.2f: (float)(end-start)) * (float)ui_glyph_spacing_x * (float)vg_console.scale * 0.5f;
                
                ui_fill_rect( &ui_global_ctx, ui_global_ctx.cursor, 0x66ffffff );
        }
@@ -177,6 +177,9 @@ static void execute_console_input( const char *cmd )
                        {
                                temp[i] = '\0';
                                in_token = 0;
+                               
+                               if( arg_count == vg_list_size( args ) )
+                                       break;
                        }
                        else
                        {