projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
textbox
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift_imgui_dev.c
diff --git
a/skaterift_imgui_dev.c
b/skaterift_imgui_dev.c
index b7517969271875b13d792f13ab80f93278b145ec..b23f04dca9f6a4277b62a40e67190b8de0168852 100644
(file)
--- a/
skaterift_imgui_dev.c
+++ b/
skaterift_imgui_dev.c
@@
-110,7
+110,7
@@
VG_STATIC void vg_gui(void)
ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
ui_rect screen = { 0, 0, vg.window_x, vg.window_y };
- ui_rect window = { 0, 0, 1
2
00, 800 };
+ ui_rect window = { 0, 0, 1
0
00, 800 };
ui_rect_center( screen, window );
{
ui_fill( window, ui_colour( k_ui_bg+1 ) );
ui_rect_center( screen, window );
{
ui_fill( window, ui_colour( k_ui_bg+1 ) );
@@
-119,16
+119,17
@@
VG_STATIC void vg_gui(void)
ui_rect title, panel;
ui_split_px( window, k_ui_axis_h, 28, 0, title, panel );
ui_fill( title, ui_colour( k_ui_bg+7 ) );
ui_rect title, panel;
ui_split_px( window, k_ui_axis_h, 28, 0, title, panel );
ui_fill( title, ui_colour( k_ui_bg+7 ) );
- ui_text( title, KBLK "Workshop tool", 1, k_ui_align_middle_center );
+ ui_text( title, "Workshop tool", 1, k_ui_align_middle_center,
+ ui_colourcont(k_ui_bg+7) );
ui_rect sidebar, content;
ui_rect sidebar, content;
- ui_split_ratio( panel, k_ui_axis_v, 0.
25
f, 1, sidebar, content );
+ ui_split_ratio( panel, k_ui_axis_v, 0.
3
f, 1, sidebar, content );
/* entries panel */
ui_fill( sidebar, ui_colour( k_ui_bg+2 ) );
ui_split_px( sidebar, k_ui_axis_h, 28, 0, title, sidebar );
/* entries panel */
ui_fill( sidebar, ui_colour( k_ui_bg+2 ) );
ui_split_px( sidebar, k_ui_axis_h, 28, 0, title, sidebar );
- ui_text( title, "Your submissions", 1, k_ui_align_middle_center );
+ ui_text( title, "Your submissions", 1, k_ui_align_middle_center
, 0
);
ui_rect controls;
ui_split_px( sidebar, k_ui_axis_h, 28, 0, controls, sidebar );
ui_rect controls;
ui_split_px( sidebar, k_ui_axis_h, 28, 0, controls, sidebar );
@@
-137,7
+138,7
@@
VG_STATIC void vg_gui(void)
ui_rect info;
ui_split_ratio( controls, k_ui_axis_v, 0.25f, 0, info, controls );
ui_rect info;
ui_split_ratio( controls, k_ui_axis_v, 0.25f, 0, info, controls );
- ui_text( info, "page 0/2", 1, k_ui_align_middle_center );
+ ui_text( info, "page 0/2", 1, k_ui_align_middle_center
, 0
);
ui_rect btn_left, btn_right;
ui_split_ratio( controls, k_ui_axis_v, 0.5f, 2, btn_left, btn_right );
ui_rect btn_left, btn_right;
ui_split_ratio( controls, k_ui_axis_v, 0.5f, 2, btn_left, btn_right );
@@
-168,7
+169,9
@@
VG_STATIC void vg_gui(void)
ui_split_px( title_entry, k_ui_axis_v,
ui_text_line_width("Title:")+8, 0, label, title_entry );
ui_split_px( title_entry, k_ui_axis_v,
ui_text_line_width("Title:")+8, 0, label, title_entry );
- ui_text( label, "Title:", 1, k_ui_align_middle_left );
+ ui_text( label, "Title:", 1, k_ui_align_middle_left
, 0
);
ui_textbox( title_entry, form_test.title, vg_list_size(form_test.title) );
}
ui_textbox( title_entry, form_test.title, vg_list_size(form_test.title) );
}
+
+ ui_dev_colourview();
}
}