From 6aec20abbba9269f1f9f49252251d3f9b324facc Mon Sep 17 00:00:00 2001 From: Emil Kosz Date: Fri, 13 Jun 2025 19:01:53 +0200 Subject: [PATCH] Font changes, etc --- game/res/textures/font_9x20.xcf | Bin 26381 -> 26381 bytes game/res/textures/icons.xcf | Bin 4829 -> 5178 bytes game/src/ui/uiman.c | 7 +------ game/src/ui/widget.c | 3 ++- game/src/ui/widget.h | 3 ++- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/game/res/textures/font_9x20.xcf b/game/res/textures/font_9x20.xcf index 30d6229b3881651326b616e1de13f8f44fdb03ef..caaa7a0f114789bfee9a21c1ba197a1c59fd81ab 100644 GIT binary patch delta 18 acmeA@$Jl$0al@LF$tO7_HXljxWC8$FYX}?w delta 16 XcmeA@$Jl$0al@JvMuyF6Qxcc}J`e_= diff --git a/game/res/textures/icons.xcf b/game/res/textures/icons.xcf index fd0500f656d7a0397f6b717b0cb5d48d7ce42ec7..3b12eadcba46100576e3485f85448eb70d17d755 100644 GIT binary patch delta 480 zcmcbsx=Uk%lc*#E1A`a?0|N^K0|O%i1A{071BdL!a3{uk9rw)Kf`Fp@zT3RtgO+iK_lvR?Mn+g#tu1_pW)h#JX%quQPEK1EQ zfe7aplw{^+R;B6|B<7@+lt2}yjEVF9<|>Xb&dH7J5|dvDE@l$`1y;li(JCSaQY0p#2jMa>)U!FjF#wNzjg|la delta 136 zcmdm`aaVPMlc+cY1A`a?0|N^K0|O%i1A{071KWX(;ZBU3zcKZ&akF@yCo2<-$Z Q6BD`!;W9APvpK*q00*}kSpWb4 diff --git a/game/src/ui/uiman.c b/game/src/ui/uiman.c index 2b96f60..9b667a1 100644 --- a/game/src/ui/uiman.c +++ b/game/src/ui/uiman.c @@ -26,7 +26,7 @@ uiman_init () Widget *debug_menu = Widget_container_new (FALSE); Widget_set_background_color (debug_menu, 0, 0, 0, 0.7); Widget_set_position (debug_menu, 32, 32); - Widget_set_size (debug_menu, 350, 150); + Widget_set_size (debug_menu, 350, 125); Widget_add_child (ui_root, debug_menu); Widget_add_child_weighed (debug_menu, Widget_label_make_float ("Frame time: %.3f", &delta_time, TEXT_ALIGN_LEFT), 1); @@ -39,11 +39,6 @@ uiman_init () Widget_add_child_weighed (poscont, Widget_label_make_float ("Y: %.1f", &camera_position[1], TEXT_ALIGN_CENTER), 1); Widget_add_child_weighed (poscont, Widget_label_make_float ("Z: %.1f", &camera_position[2], TEXT_ALIGN_RIGHT), 1); Widget_add_child_weighed (debug_menu, poscont, 1); - - Widget *butcont = Widget_container_new (TRUE); - Widget_add_child_weighed (butcont, Widget_label_make_flag_switch_button ("Toggle wireframe", "wireframe_enabled"), 1); - Widget_add_child_weighed (butcont, Widget_label_make_flag_switch_button ("Toggle flight", "flight_enabled"), 1); - Widget_add_child_weighed (debug_menu, butcont, 1); } void diff --git a/game/src/ui/widget.c b/game/src/ui/widget.c index 1bb181e..55280f9 100644 --- a/game/src/ui/widget.c +++ b/game/src/ui/widget.c @@ -393,7 +393,8 @@ uicb_label_show_int (Widget *self, void *userdata) Widget_label_printf (self, format_data->fmt, *format_data->ptr_int); } -void uicb_label_show_float (Widget *self, void *userdata) +void +uicb_label_show_float (Widget *self, void *userdata) { LabelFormatData *format_data = userdata; Widget_label_printf (self, format_data->fmt, *format_data->ptr_float); diff --git a/game/src/ui/widget.h b/game/src/ui/widget.h index ab19c47..03caa8f 100644 --- a/game/src/ui/widget.h +++ b/game/src/ui/widget.h @@ -14,7 +14,7 @@ typedef enum WidgetKind WIDGET_PLAIN, WIDGET_CONTAINER, WIDGET_LABEL, - WIDGET_ICON + WIDGET_CHECKBOX } WidgetKind; typedef struct ContainerWidget @@ -36,6 +36,7 @@ typedef struct LabelWidget TextAlignment text_alignment; } LabelWidget; + typedef struct Widget { struct Widget *parent;