comment

[vg.git] / vg_imgui.h

diff --git a/vg_imgui.h b/vg_imgui.h
index 244a3f7e5f068917cc153cf5fc8c63cd578218a3..1b5aceac38bfc931a723ac4bf24213ada60381c7 100644 (file)
--- a/vg_imgui.h
+++ b/vg_imgui.h
@@ -599,12 +599,6 @@ static void ui_split( ui_rect rect,
 }
 
 static ui_px ui_text_line_width( const char *str );
-static void ui_split_label( ui_rect rect, const char *text, ui_px size,
-                            ui_px gap, ui_rect l, ui_rect r )
-{
-   ui_px width = ui_text_line_width( text ) * size;
-   ui_split( rect, k_ui_axis_v, width, gap, l, r );
-}
 
 static void ui_rect_center( ui_rect parent, ui_rect rect )
 {
@@ -721,8 +715,8 @@ static int ui_inside_rect( ui_rect rect, ui_px co[2] )
 {
    if( co[0] >= rect[0] &&
        co[1] >= rect[1] &&
-       co[0] <= rect[0]+rect[2] &&
-       co[1] <= rect[1]+rect[3] )
+       co[0] < rect[0]+rect[2] &&
+       co[1] < rect[1]+rect[3] )
    {
       return 1;
    }
@@ -798,6 +792,15 @@ static u32 ui_colourcont( enum ui_scheme_colour id )
    else                                   return ui_colour( k_ui_fg+1 );
 }
 
+static void ui_hex_to_norm( u32 hex, v4f norm )
+{
+   norm[0] = ((hex    ) & 0xff);
+   norm[1] = ((hex>>8 ) & 0xff);
+   norm[2] = ((hex>>16) & 0xff);
+   norm[3] = ((hex>>24) & 0xff);
+   v4_muls( norm, 1.0f/255.0f, norm );
+}
+
 static u32 ui_ntext( ui_rect rect, const char *str, u32 len, ui_px scale, 
                      enum ui_align align, u32 colour )
 {
@@ -1190,7 +1193,7 @@ static void ui_enum_post(void)
 
    for( u32 i=0; i<vg_ui.dropdown.option_count; i++ ){
       ui_rect button;
-      ui_split( drawer, k_ui_axis_h, vg_ui.dropdown.rect[3], 1, button,drawer );
+      ui_split( drawer, k_ui_axis_h, vg_ui.dropdown.rect[3], 0, button,drawer );
       
       enum ui_scheme_colour colour = k_ui_bg+3;
       if( i == value->index ) colour = k_ui_orange;
@@ -1889,4 +1892,13 @@ VG_STATIC void ui_proc_utf8( const char *text )
    }
 }
 
+static void ui_label( ui_rect rect, const char *text, ui_px size,
+                      ui_px gap, ui_rect r )
+{
+   ui_rect l;
+   ui_px width = (ui_text_line_width(text)+UI_GLYPH_SPACING_X) * size;
+   ui_split( rect, k_ui_axis_v, width, gap, l, r );
+   ui_text( l, text, 1, k_ui_align_middle_left, 0 );
+}
+
 #endif /* VG_IMGUI_H */