From a32fc0f0f6bf3acc18e03fb436564cc135717157 Mon Sep 17 00:00:00 2001 From: San Jacobs Date: Fri, 13 Oct 2023 18:33:26 +0200 Subject: Leveraged fix to remove redundancies --- src/ui_implementation.odin | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ui_implementation.odin b/src/ui_implementation.odin index 594e5a1..5aa294c 100644 --- a/src/ui_implementation.odin +++ b/src/ui_implementation.odin @@ -96,7 +96,6 @@ label :: proc(text: string, font: rl.Font, alignment: Text_Alignment = .Left) -> data := oui.alloc_typed(item, Data_Label) data.subtype = .Label data.text = text - data.font_size = font.baseSize // This should not be necesssary data.font = font data.alignment = alignment @@ -134,10 +133,7 @@ ui_draw :: proc(item: oui.Item) { case .Label: data := cast(^Data_Label) oui.get_handle(item) - // For some reason, data.font.baseSize == 0 here. It doesn't outside of this function. Dunno why. - font_height := f32(data.font_size) - - rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, font_height, 0.0, rl.RAYWHITE); + rl.DrawTextEx(data.font, strings.unsafe_string_to_cstring(data.text), { 0, 0 }, f32(data.font.baseSize), 0.0, rl.RAYWHITE); //rl.DrawTextEx(rl.GetFontDefault(), strings.unsafe_string_to_cstring(data.text), { 0, 0 }, 40, 0, rl.WHITE); //rl.DrawFPS(0, 0) //fmt.println(font_height) -- cgit v1.2.1