projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adjust imgui font system
[vg.git]
/
vg_engine.c
diff --git
a/vg_engine.c
b/vg_engine.c
index 0e59528a47c61328ded87fe6703013905cd4722c..1723c70f3c26ce22e8a6856e4e0b9a31f828b04e 100644
(file)
--- a/
vg_engine.c
+++ b/
vg_engine.c
@@
-887,7
+887,7
@@
void vg_settings_ui_header( ui_rect inout_panel, const char *name )
bool vg_settings_apply_button( ui_rect inout_panel, bool validated )
{
ui_rect last_row;
bool vg_settings_apply_button( ui_rect inout_panel, bool validated )
{
ui_rect last_row;
- ui_px height = (vg_ui.font->
glyph_height
+ 18) * k_ui_scale;
+ ui_px height = (vg_ui.font->
sy
+ 18) * k_ui_scale;
ui_split( inout_panel, k_ui_axis_h, -height, k_ui_padding,
inout_panel, last_row );
ui_split( inout_panel, k_ui_axis_h, -height, k_ui_padding,
inout_panel, last_row );
@@
-1130,7
+1130,8
@@
static void vg_settings_gui(void)
ui_rect quit_button;
ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button );
ui_rect quit_button;
ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button );
- if( ui_button_text( quit_button, "X", 1 ) == 1 ){
+ if( ui_button_text( quit_button, "X", 1 ) == k_ui_button_click )
+ {
vg_settings_close();
return;
}
vg_settings_close();
return;
}