X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=menu.c;fp=menu.c;h=f6ed4f7de84c9eb78f3f5f44f505ba56d02f8b8e;hb=5a233469f45ee7cbdc89cb87956f9ef2989ad1b5;hp=279dbf5a68dfb2e2ae469697d795b74aedbd3be5;hpb=d74362c9d867f465d887ccd0df36c07efb5e125c;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/menu.c b/menu.c
index 279dbf5..f6ed4f7 100644
--- a/menu.c
+++ b/menu.c
@@ -51,7 +51,8 @@ bool menu_viewing_map(void)
 
 static void menu_decor_select( ui_rect rect )
 {
-   ui_px b = vg_ui.font->sx, hb = b/2;
+   ui_context *ctx = ui_current_context();
+   ui_px b = ctx->font->sx, hb = b/2;
    ui_rect a0 = { rect[0] - 20 - hb,           rect[1] + rect[3]/2 - hb, b,b },
            a1 = { rect[0] + rect[2] + 20 + hb, rect[1] + rect[3]/2 - hb, b,b };
 
@@ -61,7 +62,7 @@ static void menu_decor_select( ui_rect rect )
 
 static void menu_standard_widget( ui_rect inout_panel, ui_rect rect, ui_px s )
 {
-   ui_split( inout_panel, k_ui_axis_h, vg_ui.font->sy*s*2, 
+   ui_split( inout_panel, k_ui_axis_h, ui_current_context()->font->sy*s*2, 
              8, rect, inout_panel );
 }
 
@@ -177,7 +178,8 @@ static bool menu_checkbox( ui_rect inout_panel, bool select,
    menu_standard_widget( inout_panel, rect, 1 );
 
    ui_split( rect, k_ui_axis_v, -rect[3], 0, label, box );
-   ui_text( label, str_label, k_ui_scale, k_ui_align_middle_left, 0 );
+   ui_text( label, str_label, ui_current_context()->scale, 
+            k_ui_align_middle_left, 0 );
    
    enum ui_button_state state = k_ui_button_none;
 
@@ -369,7 +371,7 @@ void menu_gui(void)
 
    if( vg_input.display_input_method == k_input_method_kbm )
    {
-      vg_ui.wants_mouse = 1;
+      ui_capture_mouse(1);
    }
 
    if( skaterift.activity != k_skaterift_menu ) return;
@@ -587,7 +589,7 @@ void menu_gui(void)
     * -------------------------------------------------------------------*/
 
    ui_font_face( &vgf_default_title );
-   ui_px height = vg_ui.font->ch + 16;
+   ui_px height = ui_current_context()->font->ch + 16;
    ui_rect topbar = { 0, 0, vg.window_x, height };
 
    const char *opts[] = {
@@ -710,7 +712,7 @@ void menu_gui(void)
       
       ui_px w = ui_text( (ui_rect){ x+8, y, 1000, height }, buf, 1,
                          k_ui_align_middle_left, 0 );
-      w *= vg_ui.font->sx;
+      w *= ui_current_context()->font->sx;
       x += w + 16;
 
       vs[1].co[0] = x + 8;
@@ -742,7 +744,7 @@ void menu_gui(void)
          w = ui_text( (ui_rect){ x+16,y, 1000,height }, buf, 
                       1, k_ui_align_middle_left, 0 );
 
-         w = w*vg_ui.font->sx + 8*3;
+         w = w*ui_current_context()->font->sx + 8*3;
          x += w;
 
          if( button_down( k_srbind_mhub ) ||
@@ -1072,9 +1074,9 @@ void menu_gui(void)
 
 menu_draw:
 
-   vg_ui.frosting = 0.015f;
-   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
-   vg_ui.frosting = 0.0f;
+   g_ui_ctx->frosting = 0.015f;
+   ui_flush( k_ui_shader_colour );
+   g_ui_ctx->frosting = 0.0f;
 
    ui_font_face( &vgf_default_small );
 }