the pain is gone

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index 8cb94f1200fc0615b07f02ae72163aeff6644b09..2ec0a5070afb4640cdf97d3fbef2e8178a9c896e 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -5,8 +5,7 @@
 
 struct{
    struct gui_helper{
-      struct input_binding *bind;
-      const char *text;
+      const char *bindstr, *text;
    }
    helpers[4];
    u32 helper_count;
@@ -73,7 +72,20 @@ void gui_draw(void)
 
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
-      float w = font3d_simple_draw( font, 2, helper->text, &ortho, mmdl )+1.0f;
+      struct font3d_render render;
+      font3d_begin( font, 2, &ortho, mmdl, &render );
+
+      render.u8pch = (u8*)helper->bindstr;
+      font3d_draw( &render );
+
+      const char *make_smaller = "\x02\xaf\x03 ";
+      render.u8pch = (const u8*)make_smaller;
+      font3d_draw( &render );
+
+      render.u8pch = (u8*)helper->text;
+      font3d_draw( &render );
+      
+      float w = render.offset[0]+1.0f;
       mmdl[3][0] += w*scale;
    }
 
@@ -81,13 +93,13 @@ void gui_draw(void)
 }
 
 VG_STATIC 
-void gui_helper_action( void *bind, const char *text )
+void gui_helper_action( const char *bindstr, const char *text )
 {
    if( gui.helper_count >= vg_list_size(gui.helpers) )
       vg_fatal_error( "Too many helpers\n" );
 
    struct gui_helper *helper = &gui.helpers[ gui.helper_count ++ ];
-   helper->bind = bind;
+   helper->bindstr = bindstr;
    helper->text = text;
 }