fix clang builds

This commit is contained in:
Ryan Fleury
2024-10-07 14:43:31 -07:00
parent 7114a20e66
commit c7ce08fd71
8 changed files with 22 additions and 16 deletions
-12
View File
@@ -688,18 +688,6 @@ EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(globals);
EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(thread_locals);
EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(types);
EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF(procedures);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(watches);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(targets);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(breakpoints);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(watch_pins);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(threads);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(modules);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(locals);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(registers);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(globals);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(thread_locals);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(types);
EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF(procedures);
RD_VIEW_RULE_UI_FUNCTION_DEF(null);
EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(text);
EV_VIEW_RULE_EXPR_EXPAND_INFO_FUNCTION_DEF(disasm);
-1
View File
@@ -841,7 +841,6 @@ RD_CollectionTable:
@expand(RD_CollectionTable a) `EV_VIEW_RULE_EXPR_EXPAND_RANGE_INFO_FUNCTION_DEF($(a.name));`;
@expand(RD_CollectionTable a) `$(a.id_space == x -> "EV_VIEW_RULE_EXPR_EXPAND_ID_FROM_NUM_FUNCTION_DEF("..a.name..");")`;
@expand(RD_CollectionTable a) `$(a.id_space == x -> "EV_VIEW_RULE_EXPR_EXPAND_NUM_FROM_ID_FUNCTION_DEF("..a.name..");")`;
@expand(RD_CollectionTable a) `EV_VIEW_RULE_BLOCK_PROD_FUNCTION_DEF($(a.name));`;
}
@data(String8) rd_collection_name_table:
+1
View File
@@ -562,6 +562,7 @@ rd_rgba_from_entity(RD_Entity *entity)
}
else switch(entity->kind)
{
default:{}break;
case RD_EntityKind_Breakpoint:
{
result = rd_rgba_from_theme_color(RD_ThemeColor_Breakpoint);
+10 -2
View File
@@ -2854,6 +2854,11 @@ rd_watch_view_build(RD_WatchViewState *ewv, RD_WatchViewFlags flags, String8 roo
palette = ui_build_palette(ui_top_palette(), .text = rd_rgba_from_theme_color(RD_ThemeColor_TextNegative), .text_weak = rd_rgba_from_theme_color(RD_ThemeColor_TextNegative), .background = rd_rgba_from_theme_color(RD_ThemeColor_HighlightOverlayError));
cell_flags |= UI_BoxFlag_DrawBackground;
}
else if(cell_inheritance_string.size != 0)
{
palette = ui_build_palette(ui_top_palette(), .background = rd_rgba_from_theme_color(RD_ThemeColor_HighlightOverlay));
cell_flags |= UI_BoxFlag_DrawBackground;
}
else
{
palette = ui_build_palette(ui_top_palette(), .text = cell_base_color);
@@ -2864,6 +2869,7 @@ rd_watch_view_build(RD_WatchViewState *ewv, RD_WatchViewFlags flags, String8 roo
B32 cell_is_code = !col->is_non_code;
switch(col->kind)
{
default:{}break;
case RD_WatchViewColumnKind_Expr:
{
cell_is_code = 1;
@@ -2893,8 +2899,10 @@ rd_watch_view_build(RD_WatchViewState *ewv, RD_WatchViewFlags flags, String8 roo
UI_FocusHot(cell_selected ? UI_FocusKind_On : UI_FocusKind_Off)
UI_FocusActive((cell_selected && ewv->text_editing) ? UI_FocusKind_On : UI_FocusKind_Off)
RD_Font(cell_is_code ? RD_FontSlot_Code : RD_FontSlot_Main)
UI_FlagsAdd(cell_flags | (row_depth > 0 ? UI_BoxFlag_DrawTextWeak : 0))
UI_FlagsAdd(row_depth > 0 ? UI_BoxFlag_DrawTextWeak : 0)
{
ui_set_next_flags(ui_top_flags() | cell_flags);
// rjf: cell has errors? -> build error box
if(cell_error_string.size != 0) RD_Font(RD_FontSlot_Main)
{
@@ -3019,7 +3027,7 @@ rd_watch_view_build(RD_WatchViewState *ewv, RD_WatchViewFlags flags, String8 roo
// rjf: hovering with inheritance string -> show tooltip
if(ui_hovering(sig) && cell_inheritance_string.size != 0) UI_Tooltip
{
UI_PrefWidth(ui_children_sum(1)) UI_Row UI_PrefWidth(ui_text_dim(1, 1))
UI_PrefWidth(ui_children_sum(1)) UI_Row UI_PrefWidth(ui_text_dim(1, 1)) UI_TextPadding(0)
{
ui_labelf("Inherited from ");
RD_Font(RD_FontSlot_Code) rd_code_label(1.f, 0, rd_rgba_from_theme_color(RD_ThemeColor_CodeDefault), cell_inheritance_string);