diff --git a/src/wasm_app/main.c b/src/wasm_app/main.c index 631c8af..dd143f7 100644 --- a/src/wasm_app/main.c +++ b/src/wasm_app/main.c @@ -31,11 +31,6 @@ fn void app_init(f32 dpr) { rn_init(perm, 50 * dpr); } -fn f32 get_font_size(void) { - f32 size = rn_state.main_font.size; - return size; -} - fn b32 app_update(app_frame_t *frame) { assert(frame != NULL); ui_begin_frame(frame); @@ -125,7 +120,7 @@ fn b32 app_update(app_frame_t *frame) { // scroller { - f32 all_items_size = (f32)item_box->node_count * get_font_size(); + f32 all_items_size = (f32)item_box->node_count * rn_state.main_font.size; f32 item_box_size = r2f32_get_size(item_box->rect).y; f32 scroller_size = CLAMP(item_box_size / all_items_size, 0, 1.0f); diff --git a/src/wasm_app/ui.h b/src/wasm_app/ui.h index 558fdf7..dc01c99 100644 --- a/src/wasm_app/ui.h +++ b/src/wasm_app/ui.h @@ -150,7 +150,7 @@ fn b32 ui_is_active_box(ui_box_t *box) { return !ui_is_null_box(box) && box->id. fn ui_size_t ui_size(ui_size_kind_t kind, f32 value) { return (ui_size_t){.kind = kind, .value = value}; } #define ui_pixels(value) ui_size(ui_size_kind_pixels, value) -#define ui_em(value) ui_size(ui_size_kind_pixels, value * get_font_size()) +#define ui_em(value) ui_size(ui_size_kind_pixels, value * rn_state.main_font.size) #define ui_text() ui_size(ui_size_kind_text_content, 0) #define ui_children_sum() ui_size(ui_size_kind_children_sum, 0) #define ui_percent(value) ui_size(ui_size_kind_percent_of_parent, value)