General refactors to various files
* Moved all mapped procedure overloads to grime.odin * Removed extraneous entity_box related procedures * Major refactor to grime_array its header is now allocated as part of its initialization *
This commit is contained in:
13
code/ui.odin
13
code/ui.odin
@ -268,8 +268,8 @@ UI_State :: struct {
|
||||
layout_dirty : b32,
|
||||
|
||||
// TODO(Ed) : Look into using a build arena like Ryan does for these possibly (and thus have a linked-list stack)
|
||||
theme_stack : Stack( UI_StyleTheme, UI_Style_Stack_Size ),
|
||||
parent_stack : Stack( ^ UI_Box, UI_Parent_Stack_Size ),
|
||||
theme_stack : StackFixed( UI_StyleTheme, UI_Style_Stack_Size ),
|
||||
parent_stack : StackFixed( ^ UI_Box, UI_Parent_Stack_Size ),
|
||||
// flag_stack : Stack( UI_BoxFlags, UI_BoxFlags_Stack_Size ),
|
||||
|
||||
hot : UI_Key,
|
||||
@ -558,11 +558,11 @@ ui_style_set_layout :: proc ( layout : UI_Layout, preset : UI_StylePreset ) {
|
||||
}
|
||||
|
||||
ui_style_theme_push :: proc( preset : UI_StyleTheme ) {
|
||||
stack_push( & get_state().ui_context.theme_stack, preset )
|
||||
push( & get_state().ui_context.theme_stack, preset )
|
||||
}
|
||||
|
||||
ui_style_theme_pop :: proc() {
|
||||
stack_pop( & get_state().ui_context.theme_stack )
|
||||
pop( & get_state().ui_context.theme_stack )
|
||||
}
|
||||
|
||||
@(deferred_none = ui_style_theme_pop)
|
||||
@ -575,8 +575,3 @@ ui_style_theme_set_layout :: proc ( layout : UI_Layout ) {
|
||||
preset.layout = layout
|
||||
}
|
||||
}
|
||||
|
||||
ui_set_layout :: proc {
|
||||
ui_style_set_layout,
|
||||
ui_style_theme_set_layout,
|
||||
}
|
||||
|
Reference in New Issue
Block a user