ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-13 07:32:23 -07:00
Code Issues Packages Projects Releases Wiki Activity

more progress on simplifying/condensing new theme colors

Browse Source
This commit is contained in:
Ryan Fleury
2024-06-24 14:08:28 -07:00
parent 6d75d6b63b
commit 31c671e3f5
10 changed files with 304 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/core/df_core.c
+6 -47
View File
@@ -3963,25 +3963,16 @@ df_ctrl_run(DF_RunKind run, DF_Entity *run_thread, CTRL_RunFlags flags, CTRL_Tra
}
}
}
if(df_state->ctrl_solo_stepping_mode && !df_entity_is_nil(run_thread))
for(DF_HandleNode *n = df_state->frozen_threads.first; n != 0; n = n->next)
{
msg.freeze_state_is_frozen = 0;
CTRL_MachineIDHandlePair pair = {run_thread->ctrl_machine_id, run_thread->ctrl_handle};
ctrl_machine_id_handle_pair_list_push(scratch.arena, &msg.freeze_state_threads, &pair);
}
else
{
for(DF_HandleNode *n = df_state->frozen_threads.first; n != 0; n = n->next)
DF_Entity *thread = df_entity_from_handle(n->handle);
if(!df_entity_is_nil(thread))
{
DF_Entity *thread = df_entity_from_handle(n->handle);
if(!df_entity_is_nil(thread))
{
CTRL_MachineIDHandlePair pair = {thread->ctrl_machine_id, thread->ctrl_handle};
ctrl_machine_id_handle_pair_list_push(scratch.arena, &msg.freeze_state_threads, &pair);
}
CTRL_MachineIDHandlePair pair = {thread->ctrl_machine_id, thread->ctrl_handle};
ctrl_machine_id_handle_pair_list_push(scratch.arena, &msg.freeze_state_threads, &pair);
}
msg.freeze_state_is_frozen = 1;
}
msg.freeze_state_is_frozen = 1;
}
// rjf: push msg
@@ -6192,15 +6183,6 @@ df_cfg_strings_from_core(Arena *arena, String8 root_path, DF_CfgSrc source)
str8_list_push(arena, &strs, str8_lit("}\n\n"));
}
//- rjf: write control settings
if(source == DF_CfgSrc_Project)
{
str8_list_push(arena, &strs, str8_lit("/// control settings //////////////////////////////////////////////////////////\n"));
str8_list_push(arena, &strs, str8_lit("\n"));
str8_list_pushf(arena, &strs, "solo_stepping_mode: %i\n", df_state->ctrl_solo_stepping_mode);
str8_list_push(arena, &strs, str8_lit("\n"));
}
//- rjf: write eval view cache
#if 0
if(source == DF_CfgSrc_Project)
@@ -7738,16 +7720,6 @@ df_core_begin_frame(Arena *arena, DF_CmdList *cmds, F32 dt)
}
}break;
//- rjf: solo-stepping mode
case DF_CoreCmdKind_EnableSoloSteppingMode:
{
df_state->ctrl_solo_stepping_mode = 1;
}break;
case DF_CoreCmdKind_DisableSoloSteppingMode:
{
df_state->ctrl_solo_stepping_mode = 0;
}break;
//- rjf: debug control context management operations
case DF_CoreCmdKind_SelectThread:
{
@@ -8455,19 +8427,6 @@ df_core_begin_frame(Arena *arena, DF_CmdList *cmds, F32 dt)
}
}
}
//- rjf: apply control settings
{
DF_CfgVal *solo_stepping_mode_cfg_val = df_cfg_val_from_string(table, str8_lit("solo_stepping_mode"));
if(solo_stepping_mode_cfg_val != &df_g_nil_cfg_val)
{
DF_CfgNode *value_cfg = solo_stepping_mode_cfg_val->last->first;
U64 val = 0;
try_u64_from_str8_c_rules(value_cfg->string, &val);
df_state->ctrl_solo_stepping_mode = (B32)val;
}
}
}break;
//- rjf: writing config changes
src/df/core/df_core.h
-1
View File
@@ -1242,7 +1242,6 @@ struct DF_State
Arena *ctrl_msg_arena;
CTRL_MsgList ctrl_msgs;
U64 ctrl_exception_code_filters[(CTRL_ExceptionCodeKind_COUNT+63)/64];
B32 ctrl_solo_stepping_mode;
// rjf: control thread ctrl -> user reading state
CTRL_EntityStore *ctrl_entity_store;
src/df/core/df_core.mdesk
-4
View File
@@ -145,10 +145,6 @@ DF_CoreCmdTable:// | | |
{RunToCursor 0 Null Nil 0 0 0 0 0 0 Play "run_to_cursor" "Run To Cursor" "Runs the selected thread to the current cursor." "" }
{SetNextStatement 0 Null Nil 0 0 0 0 0 0 RightArrow "set_next_statement" "Set Next Statement" "Sets the selected thread's instruction pointer to the cursor's position." "" }
//- rjf: solo stepping mode
{EnableSoloSteppingMode 0 Null Nil 0 0 0 0 0 0 Thread "enable_solo_stepping_mode" "Enable Solo Stepping Mode" "Enables 'solo stepping mode', which suspends all non-selected threads before stepping." "solo,stepping,mode,suspend" }
{DisableSoloSteppingMode 0 Null Nil 0 0 0 0 0 0 Thread "disable_solo_stepping_mode" "Disable Solo Stepping Mode" "Disables 'solo stepping mode', which suspends all non-selected threads before stepping." "solo,stepping,mode,suspend" }
//- rjf: debug control context management operations
{SelectThread 0 Entity Thread 0 0 0 0 0 1 Null "select_thread" "Select Thread" "Selects a thread." "" }
{SelectThreadWindow 0 Entity Thread 0 0 0 0 0 1 Null "select_thread_window" "Select Thread On Window" "Selects a thread for the active window, overriding the global selected thread." "" }
src/df/core/generated/df_core.meta.c
+1 -3
View File
@@ -214,7 +214,7 @@ DF_CoreCmdKind_Null,
DF_CoreCmdKind_Null,
};
DF_CmdSpecInfo df_g_core_cmd_kind_spec_info_table[220] =
DF_CmdSpecInfo df_g_core_cmd_kind_spec_info_table[218] =
{
{ str8_lit_comp(""), str8_lit_comp(""), str8_lit_comp(""), str8_lit_comp(""), (DF_CmdSpecFlag_OmitFromLists*1), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_Null},
{ str8_lit_comp("exit"), str8_lit_comp("Exits the debugger."), str8_lit_comp("quit,close,abort"), str8_lit_comp("Exit"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_X},
@@ -243,8 +243,6 @@ DF_CmdSpecInfo df_g_core_cmd_kind_spec_info_table[220] =
{ str8_lit_comp("step_over"), str8_lit_comp("Steps once, always over function calls, for either line or instructions."), str8_lit_comp(""), str8_lit_comp("Step Over"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_StepOver},
{ str8_lit_comp("run_to_cursor"), str8_lit_comp("Runs the selected thread to the current cursor."), str8_lit_comp(""), str8_lit_comp("Run To Cursor"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_Play},
{ str8_lit_comp("set_next_statement"), str8_lit_comp("Sets the selected thread's instruction pointer to the cursor's position."), str8_lit_comp(""), str8_lit_comp("Set Next Statement"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_RightArrow},
{ str8_lit_comp("enable_solo_stepping_mode"), str8_lit_comp("Enables 'solo stepping mode', which suspends all non-selected threads before stepping."), str8_lit_comp("solo,stepping,mode,suspend"), str8_lit_comp("Enable Solo Stepping Mode"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_Thread},
{ str8_lit_comp("disable_solo_stepping_mode"), str8_lit_comp("Disables 'solo stepping mode', which suspends all non-selected threads before stepping."), str8_lit_comp("solo,stepping,mode,suspend"), str8_lit_comp("Disable Solo Stepping Mode"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Null, DF_EntityKind_Nil, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*0)}, DF_IconKind_Thread},
{ str8_lit_comp("select_thread"), str8_lit_comp("Selects a thread."), str8_lit_comp(""), str8_lit_comp("Select Thread"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Entity, DF_EntityKind_Thread, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*1)}, DF_IconKind_Null},
{ str8_lit_comp("select_thread_window"), str8_lit_comp("Selects a thread for the active window, overriding the global selected thread."), str8_lit_comp(""), str8_lit_comp("Select Thread On Window"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Entity, DF_EntityKind_Thread, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*1)}, DF_IconKind_Null},
{ str8_lit_comp("select_thread_view"), str8_lit_comp("Selects a thread for the active view, overriding the global and per-window selected threads."), str8_lit_comp(""), str8_lit_comp("Select Thread On View"), (DF_CmdSpecFlag_OmitFromLists*0), {DF_CmdParamSlot_Entity, DF_EntityKind_Thread, (DF_CmdQueryFlag_AllowFiles*0)|(DF_CmdQueryFlag_AllowFolders*0)|(DF_CmdQueryFlag_CodeInput*0)|(DF_CmdQueryFlag_KeepOldInput*0)|(DF_CmdQueryFlag_SelectOldInput*0)|(DF_CmdQueryFlag_Required*1)}, DF_IconKind_Null},
src/df/core/generated/df_core.meta.h
-2
View File
@@ -75,8 +75,6 @@ DF_CoreCmdKind_StepInto,
DF_CoreCmdKind_StepOver,
DF_CoreCmdKind_RunToCursor,
DF_CoreCmdKind_SetNextStatement,
DF_CoreCmdKind_EnableSoloSteppingMode,
DF_CoreCmdKind_DisableSoloSteppingMode,
DF_CoreCmdKind_SelectThread,
DF_CoreCmdKind_SelectThreadWindow,
DF_CoreCmdKind_SelectThreadView,
src/df/gfx/df_gfx.c
+25 -32
View File
@@ -4692,7 +4692,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
os_window_clear_custom_border_data(ws->os);
os_window_push_custom_edges(ws->os, window_edge_px);
os_window_push_custom_title_bar(ws->os, dim_2f32(top_bar_rect).y);
ui_set_next_flags(UI_BoxFlag_DefaultFocusNav);
ui_set_next_flags(UI_BoxFlag_DefaultFocusNav|UI_BoxFlag_DisableFocusOverlay);
DF_Palette(DF_PaletteCode_MenuBar)
UI_Focus((ws->menu_bar_focused && window_is_focused && !ui_any_ctx_menu_is_open() && !hover_eval_is_open) ? UI_FocusKind_On : UI_FocusKind_Null)
UI_Pane(top_bar_rect, str8_lit("###top_bar"))
@@ -5155,7 +5155,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
if(can_play || !have_targets || processes.count == 0)
UI_TextAlignment(UI_TextAlign_Center)
UI_Flags((can_play ? 0 : UI_BoxFlag_Disabled))
DF_Palette(DF_PaletteCode_MenuBar)
UI_Palette(ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextPositive)))
{
UI_Signal sig = ui_button(df_g_icon_kind_text_table[DF_IconKind_Play]);
os_window_push_custom_title_bar_client_area(ws->os, sig.box->rect);
@@ -6091,8 +6091,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
{
if(row_is_fresh)
{
Vec4F32 rgba = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
rgba.w *= 0.2f;
Vec4F32 rgba = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = rgba));
}
UI_Signal sig = df_line_editf(DF_LineEditFlag_CodeContents|
@@ -6118,8 +6117,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
{
if(row_is_fresh)
{
Vec4F32 rgba = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
rgba.w *= 0.2f;
Vec4F32 rgba = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = rgba));
ui_set_next_flags(UI_BoxFlag_DrawBackground);
}
@@ -6276,7 +6274,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
ui_set_next_child_layout_axis(axis2_flip(axis));
if(ui_key_match(key, ui_drop_hot_key()))
{
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Highlight0)));
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Hover)));
}
site_box_viz = ui_build_box_from_key(UI_BoxFlag_DrawBackground|
UI_BoxFlag_DrawBorder|
@@ -6361,7 +6359,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
ui_set_next_child_layout_axis(axis2_flip(split_axis));
if(ui_key_match(key, ui_drop_hot_key()))
{
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Highlight0)));
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Hover)));
}
site_box_viz = ui_build_box_from_key(UI_BoxFlag_DrawBackground|
UI_BoxFlag_DrawBorder|
@@ -6664,7 +6662,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
ui_set_next_child_layout_axis(axis2_flip(split_axis));
if(ui_key_match(key, ui_drop_hot_key()))
{
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Highlight0)));
ui_set_next_palette(ui_build_palette(ui_top_palette(), .border = df_rgba_from_theme_color(DF_ThemeColor_Hover)));
}
site_box_viz = ui_build_box_from_key(UI_BoxFlag_DrawBackground|
UI_BoxFlag_DrawBorder|
@@ -6865,7 +6863,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: colors
Vec4F32 bg_color = v4f32(0.1f, 0.1f, 0.1f, 1);
Vec4F32 bd_color = df_rgba_from_theme_color(DF_ThemeColor_FloatingBorder);
Vec4F32 hl_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
Vec4F32 hl_color = df_rgba_from_theme_color(DF_ThemeColor_TextNeutral);
bg_color.w *= view->loading_t;
bd_color.w *= view->loading_t;
hl_color.w *= view->loading_t;
@@ -7104,10 +7102,9 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: build tab container box
UI_Parent(tab_column_box) UI_PrefHeight(ui_px(tab_bar_vheight, 1)) DF_Palette(view_is_selected ? DF_PaletteCode_Tab : DF_PaletteCode_TabInactive)
{
if((!view_is_selected && panel->tab_side == Side_Min) ||
(view_is_selected && panel->tab_side == Side_Max))
if(panel->tab_side == Side_Max)
{
ui_spacer(ui_px(1.f, 1.f));
ui_spacer(ui_px(tab_bar_rv_diff, 1.f));
}
else
{
@@ -7118,7 +7115,6 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
UI_BoxFlag_DrawBackground|
UI_BoxFlag_DrawBorder|
(UI_BoxFlag_DrawDropShadow*view_is_selected)|
UI_BoxFlag_AnimatePosY|
UI_BoxFlag_Clickable,
"tab_%p", view);
@@ -7708,7 +7704,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: brighten
{
R_Rect2DInst *inst = d_rect(box->rect, v4f32(0, 0, 0, 0), 0, 0, 1.f);
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Hover);
color.w *= t*0.2f;
inst->colors[Corner_00] = color;
inst->colors[Corner_01] = color;
@@ -7738,7 +7734,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: active effect extension
if(box->flags & UI_BoxFlag_DrawActiveEffects)
{
Vec4F32 shadow_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
Vec4F32 shadow_color = df_rgba_from_theme_color(DF_ThemeColor_Hover);
shadow_color.x *= 0.3f;
shadow_color.y *= 0.3f;
shadow_color.z *= 0.3f;
@@ -7806,8 +7802,7 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
d_truncated_fancy_run_list(text_position, &box->display_string_runs, max_x, ellipses_run);
if(box->flags & UI_BoxFlag_HasFuzzyMatchRanges)
{
Vec4F32 match_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
match_color.w *= 0.25f;
Vec4F32 match_color = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
d_truncated_fancy_run_fuzzy_matches(text_position, &box->display_string_runs, max_x, &box->fuzzy_match_ranges, match_color);
}
}
@@ -7903,8 +7898,8 @@ df_window_update_and_render(Arena *arena, DF_Window *ws, DF_CmdList *cmds)
// rjf: hover effect
if(b->flags & UI_BoxFlag_DrawHotEffects)
{
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
color.w *= 0.5f*b->hot_t;
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Hover);
color.w *= b->hot_t;
R_Rect2DInst *inst = d_rect(pad_2f32(b->rect, 1.f), color, 0, 1.f, 1.f);
MemoryCopyArray(inst->corner_radii, b->corner_radii);
}
@@ -9827,8 +9822,8 @@ df_cmd_binding_button(DF_CmdSpec *spec)
}
if(df_gfx_state->bind_change_active && df_gfx_state->bind_change_cmd_spec == spec)
{
palette->colors[UI_ColorCode_Border] = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
palette->colors[UI_ColorCode_Background] = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
palette->colors[UI_ColorCode_Border] = df_rgba_from_theme_color(DF_ThemeColor_Hover);
palette->colors[UI_ColorCode_Background] = df_rgba_from_theme_color(DF_ThemeColor_Hover);
palette->colors[UI_ColorCode_Background].w *= 0.25f;
}
}
@@ -10197,7 +10192,7 @@ df_entity_desc_button(DF_Window *ws, DF_Entity *entity, FuzzyMatchRangeList *nam
}
else if(entity->kind == DF_EntityKind_Target && entity->b32 != 0)
{
palette = df_palette_from_code(DF_PaletteCode_PositivePopButton);
palette = df_palette_from_code(DF_PaletteCode_NeutralPopButton);
}
ui_set_next_hover_cursor(OS_Cursor_HandPoint);
ui_set_next_palette(palette);
@@ -10612,7 +10607,7 @@ df_code_slice(DF_Window *ws, DF_CtrlCtx *ctrl_ctx, EVAL_ParseCtx *parse_ctx, DF_
{
if(n->entity == stopper_thread && (stop_event.cause == CTRL_EventCause_InterruptedByTrap || stop_event.cause == CTRL_EventCause_InterruptedByException))
{
line_bg_colors[line_idx] = df_rgba_from_theme_color(DF_ThemeColor_CodeBackgroundNegative);
line_bg_colors[line_idx] = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlayError);
}
}
}
@@ -11656,8 +11651,7 @@ df_code_slice(DF_Window *ws, DF_CtrlCtx *ctrl_ctx, EVAL_ParseCtx *parse_ctx, DF_
{
TxtRngColorPairNode *n = push_array(scratch.arena, TxtRngColorPairNode, 1);
n->rng = result.mouse_expr_rng;
n->color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
n->color.w *= 0.3f;
n->color = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
SLLQueuePush(first_txt_rng_color_pair, last_txt_rng_color_pair, n);
}
}
@@ -11668,8 +11662,8 @@ df_code_slice(DF_Window *ws, DF_CtrlCtx *ctrl_ctx, EVAL_ParseCtx *parse_ctx, DF_
if(params->flags & DF_CodeSliceFlag_LineNums) UI_Parent(text_container_box) ProfScope("build line numbers") UI_Focus(UI_FocusKind_Off)
{
TxtRng select_rng = txt_rng(*cursor, *mark);
Vec4F32 active_color = df_rgba_from_theme_color(DF_ThemeColor_CodeLineNumbersActive);
Vec4F32 inactive_color = df_rgba_from_theme_color(DF_ThemeColor_CodeLineNumbersInactive);
Vec4F32 active_color = df_rgba_from_theme_color(DF_ThemeColor_CodeLineNumbersSelected);
Vec4F32 inactive_color = df_rgba_from_theme_color(DF_ThemeColor_CodeLineNumbers);
if(params->margin_float_off_px != 0)
{
ui_set_next_pref_width(ui_px(params->line_num_width_px, 1.f));
@@ -11927,8 +11921,7 @@ df_code_slice(DF_Window *ws, DF_CtrlCtx *ctrl_ctx, EVAL_ParseCtx *parse_ctx, DF_
line_box->rect.x0+match_column_pixel_off_range.max+2.f,
line_box->rect.y1,
};
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
color.w *= 0.8f;
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
if(cursor->line == line_num && needle_pos+1 <= cursor->column && cursor->column < needle_pos+params->search_query.size+1)
{
color.x += (1.f - color.x) * 0.5f;
@@ -12462,7 +12455,7 @@ df_error_label(String8 string)
{
UI_Box *box = ui_build_box_from_stringf(UI_BoxFlag_Clickable, "###%S_error_label", string);
UI_Signal sig = ui_signal_from_box(box);
UI_Parent(box)
UI_Parent(box) UI_Palette(ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextNegative), .text_weak = df_rgba_from_theme_color(DF_ThemeColor_TextNegative)))
{
ui_set_next_font(df_font_from_slot(DF_FontSlot_Icons));
ui_set_next_run_flags(F_RunFlag_Smooth);
@@ -14136,7 +14129,7 @@ df_gfx_begin_frame(Arena *arena, DF_CmdList *cmds)
{
df_gfx_state->cfg_palettes[code].null = v4f32(1, 0, 1, 1);
df_gfx_state->cfg_palettes[code].cursor = current->colors[DF_ThemeColor_Cursor];
df_gfx_state->cfg_palettes[code].selection = current->colors[DF_ThemeColor_Selection];
df_gfx_state->cfg_palettes[code].selection = current->colors[DF_ThemeColor_SelectionOverlay];
}
df_gfx_state->cfg_palettes[DF_PaletteCode_Base].background = current->colors[DF_ThemeColor_BaseBackground];
df_gfx_state->cfg_palettes[DF_PaletteCode_Base].text = current->colors[DF_ThemeColor_Text];
src/df/gfx/df_gfx.mdesk
+77 -81
View File
@@ -366,103 +366,99 @@ DF_ThemePresetTable:
{ FarManager far_manager "Far Manager" }
}
@table(name display_name name_lower default_dark default_light vs_dark vs_light solarized_dark solarized_light handmade_hero four_coder far_manager)
@table(name display_name name_lower default_dark default_light vs_dark vs_light solarized_dark solarized_light handmade_hero four_coder far_manager desc)
DF_ThemeColorTable:
{
{Null "Null" null 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff }
{Null "Null" null 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff 0xff00ffff ""}
//- rjf: global ui colors
{Selection "Selection" selection 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c }
{DropShadow "Drop Shadow" drop_shadow 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f }
{Cursor "Cursor" cursor 0x8bff00ff 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 }
{CursorInactive "Cursor (Inactive)" cursor_inactive 0xb23217ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{Focus "Focus" focus 0xfea200ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff }
{Hover "Hover" hover 0x7bffc7ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff }
{Highlight0 "Highlight 0" highlight_0 0xfe9603ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{Highlight1 "Highlight 1" highlight_1 0x7bffc7ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{DisabledOverlay "Disabled Overlay" disabled_overlay 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f }
{DropSiteOverlay "Drop Site Overlay" drop_site_overlay 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c }
{InactivePanelOverlay "Inactive Panel Overlay" inactive_panel_overlay 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f }
{Text "Text" text 0xbebebeff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{TextPositive "Text (Positive)" text_positive 0x4dc221ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff }
{TextNegative "Text (Negative)" text_negative 0xc56553ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{TextNeutral "Text (Neutral)" text_neutral 0x327fb2ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{TextWeak "Text (Weak)" text_weak 0xa4a4a4fe 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f }
{Text "Text" text 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff ""}
{TextPositive "Text (Positive)" text_positive 0x4dc221ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff 0x32b219ff ""}
{TextNegative "Text (Negative)" text_negative 0xc56452ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff ""}
{TextNeutral "Text (Neutral)" text_neutral 0x307eb2ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff ""}
{TextWeak "Text (Weak)" text_weak 0xa4a4a4fe 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f 0xffffff7f ""}
{Cursor "Cursor" cursor 0x8aff00ff 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 0x66e566e5 ""}
{CursorInactive "Cursor (Inactive)" cursor_inactive 0xb23217ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff ""}
{Focus "Focus" focus 0xfda200ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff ""}
{Hover "Hover" hover 0xffffffff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff 0xb27219ff ""}
{DropShadow "Drop Shadow" drop_shadow 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f 0x0000007f ""}
{DisabledOverlay "Disabled Overlay" disabled_overlay 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f ""}
{DropSiteOverlay "Drop Site Overlay" drop_site_overlay 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c 0xffffff0c ""}
{InactivePanelOverlay "Inactive Panel Overlay" inactive_panel_overlay 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f ""}
{SelectionOverlay "Selection Overlay" selection_overlay 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c 0x99ccff4c ""}
{HighlightOverlay "Highlight Overlay" highlight_overlay 0x3b4a515f
0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f ""}
{HighlightOverlayError "Error Highlight Overlay" error_highlight_overlay 0x5f12005f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f 0x0000003f ""}
//- rjf: base ui container colors
{BaseBackground "Base Background" base_background 0x1b1b1bfe 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{BaseBackgroundAlt "Base Background (Alternate)" base_background_alt 0x2b2b2bfe 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{BaseBorder "Base Border" base_border 0x3f3f3ffe 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 }
{BaseBackground "Base Background" base_background 0x1b1b1bfe 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{BaseBackgroundAlt "Base Background (Alternate)" base_background_alt 0x2b2b2bfe 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{BaseBorder "Base Border" base_border 0x3f3f3ffe 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 ""}
//- rjf: menu bar ui container colors
{MenuBarBackground "Menu Bar Background" menu_bar_background 0x3e4c577f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{MenuBarBackgroundAlt "Menu Bar Background (Alternate)" menu_bar_background_alt 0x3e4c577f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{MenuBarBorder "Menu Bar Border" menu_bar_border 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 }
{MenuBarBackground "Menu Bar Background" menu_bar_background 0x3e4c577f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{MenuBarBackgroundAlt "Menu Bar Background (Alternate)" menu_bar_background_alt 0x3e4c577f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{MenuBarBorder "Menu Bar Border" menu_bar_border 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 ""}
//- rjf: floating ui container colors
{FloatingBackground "Floating Background" floating_background 0x33333333 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{FloatingBackgroundAlt "Floating Background (Alternate)" floating_background_alt 0x33333333 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{FloatingBorder "Floating Border" floating_border 0x3f3f3ffd 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 }
{FloatingBackground "Floating Background" floating_background 0x33333333 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{FloatingBackgroundAlt "Floating Background (Alternate)" floating_background_alt 0x33333333 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f ""}
{FloatingBorder "Floating Border" floating_border 0x3f3f3ffd 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 0xffffff19 ""}
//- rjf: ui element colors
{ImplicitButtonBackground "Implicit Button Background" implicit_button_background 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{ImplicitButtonBorder "Implicit Button Border" implicit_button_border 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{PlainButtonBackground "Plain Button Background" plain_button_background 0x1b1b1bfe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{PlainButtonBorder "Plain Button Border" plain_button_border 0x3f3f3ffe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{PositivePopButtonBackground "Positive Pop Button Background" positive_pop_button_background 0x2d7e3eff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{PositivePopButtonBorder "Positive Pop Button Border" positive_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{NegativePopButtonBackground "Negative Pop Button Background" negative_pop_button_background 0x803425ff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{NegativePopButtonBorder "Negative Pop Button Border" negative_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{NeutralPopButtonBackground "Neutral Pop Button Background" neutral_pop_button_background 0x355b6eff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{NeutralPopButtonBorder "Neutral Pop Button Border" neutral_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{ScrollBarButtonBackground "Scroll Bar Button Background" scroll_bar_button_background 0x2b2b2bfe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{ScrollBarButtonBorder "Scroll Bar Button Border" scroll_bar_button_border 0x3f3f3ffe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{TabBackground "Tab Background" tab_background 0x7b4d27fe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{TabBorder "Tab Border" tab_border 0xb48300fd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{TabBackgroundInactive "Tab Background (Inactive)" tab_background_inactive 0x3e4c577f 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
{TabBorderInactive "Tab Border (Inactive)" tab_border_inactive 0xffffff19 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 }
//- rjf: code ui colors
{CodeBackgroundNegative "Code Background (Negative)" code_background_negative 0x3b1f1ffe 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f 0x3333337f }
{CodeLineNumbersActive "Code Line Numbers" code_line_numbers_active 0xbebebeff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{CodeLineNumbersInactive "Code Line Numbers (Inactive)" code_line_numbers_inactive 0x7f7f7fff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{ImplicitButtonBackground "Implicit Button Background" implicit_button_background 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{ImplicitButtonBorder "Implicit Button Border" implicit_button_border 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{PlainButtonBackground "Plain Button Background" plain_button_background 0x1b1b1bfe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{PlainButtonBorder "Plain Button Border" plain_button_border 0x3f3f3ffe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{PositivePopButtonBackground "Positive Pop Button Background" positive_pop_button_background 0x2c5b36ff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{PositivePopButtonBorder "Positive Pop Button Border" positive_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{NegativePopButtonBackground "Negative Pop Button Background" negative_pop_button_background 0x803425ff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{NegativePopButtonBorder "Negative Pop Button Border" negative_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{NeutralPopButtonBackground "Neutral Pop Button Background" neutral_pop_button_background 0x355b6eff 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{NeutralPopButtonBorder "Neutral Pop Button Border" neutral_pop_button_border 0x3f3f3ffd 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{ScrollBarButtonBackground "Scroll Bar Button Background" scroll_bar_button_background 0x2b2b2bfe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{ScrollBarButtonBorder "Scroll Bar Button Border" scroll_bar_button_border 0x3f3f3ffe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{TabBackground "Tab Background" tab_background 0x6f5135fe 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{TabBorder "Tab Border" tab_border 0xfefefe4d 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{TabBackgroundInactive "Tab Background (Inactive)" tab_background_inactive 0x3e4c577f 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
{TabBorderInactive "Tab Border (Inactive)" tab_border_inactive 0xffffff19 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 0x00000000 ""}
//- rjf: code colors
{CodeDefault "Code (Default)" code_default 0xbebebeff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{CodeSymbol "Code (Symbol)" code_symbol 0x6093c2ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff }
{CodeType "Code (Type)" code_type 0xecb31aff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff }
{CodeLocal "Code (Local)" code_local 0xadc9e0ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff }
{CodeRegister "Code (Register)" code_register 0xb7afd5ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff }
{CodeKeyword "Code (Keyword)" code_keyword 0xb18e32ff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff }
{CodeDelimiterOperator "Code (Delimiters/Operators)" code_delimiter_operator 0x7f7f7fff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff }
{CodeNumeric "Code (Numeric)" code_numeric 0x89b379ff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff }
{CodeNumericAltDigitGroup "Code (Numeric, Alt. Digit Group)" code_numeric_alt_digit_group 0x608752ff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff }
{CodeString "Code (String)" code_string 0x89b379ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff }
{CodeMeta "Code (Meta)" code_meta 0x906f81ff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff }
{CodeComment "Code (Comment)" code_comment 0x717171ff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff }
{CodeLineNumbers "Code Line Numbers" code_line_numbers 0x7f7f7fff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{CodeLineNumbersSelected "Code Line Numbers (Selected)" code_line_numbers_selected 0xbebebeff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff }
{CodeDefault "Code (Default)" code_default 0xcbcbcbff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff ""}
{CodeSymbol "Code (Symbol)" code_symbol 0x42a2cffe 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff 0x7fcc99ff ""}
{CodeType "Code (Type)" code_type 0xfec746ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff 0x66b2e5ff ""}
{CodeLocal "Code (Local)" code_local 0x98bc80ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff 0xfe9548ff ""}
{CodeRegister "Code (Register)" code_register 0xb7afd5ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff 0xd45d90ff ""}
{CodeKeyword "Code (Keyword)" code_keyword 0xb38d4cff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff 0xf7bf5eff ""}
{CodeDelimiterOperator "Code (Delimiters/Operators)" code_delimiter_operator 0x767676ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff 0x994c32ff ""}
{CodeNumeric "Code (Numeric)" code_numeric 0x98abb1ff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff 0x4ce54cff ""}
{CodeNumericAltDigitGroup "Code (Numeric, Alt. Digit Group)" code_numeric_alt_digit_group 0x738287ff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff 0x4ca54cff ""}
{CodeString "Code (String)" code_string 0x98abb1ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff 0xe5cc66ff ""}
{CodeMeta "Code (Meta)" code_meta 0xd96759ff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff 0xe54c4cff ""}
{CodeComment "Code (Comment)" code_comment 0x717171ff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff 0x7f7f7fff ""}
{CodeLineNumbers "Code Line Numbers" code_line_numbers 0x7f7f7fff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff ""}
{CodeLineNumbersSelected "Code Line Numbers (Selected)" code_line_numbers_selected 0xbebebeff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff 0xe5e5e5ff ""}
//- rjf: debugging colors
{LineInfoBackground0 "Line Info Background 0" line_info_background_0 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f }
{LineInfoBackground1 "Line Info Background 1" line_info_background_1 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f }
{LineInfoBackground2 "Line Info Background 2" line_info_background_2 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f }
{LineInfoBackground3 "Line Info Background 3" line_info_background_3 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f }
{LineInfoBackground4 "Line Info Background 4" line_info_background_4 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f }
{LineInfoBackground5 "Line Info Background 5" line_info_background_5 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f }
{LineInfoBackground6 "Line Info Background 6" line_info_background_6 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f }
{LineInfoBackground7 "Line Info Background 7" line_info_background_7 0xcefd693f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f }
{Thread0 "Thread 0" thread_0 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff }
{Thread1 "Thread 1" thread_1 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff }
{Thread2 "Thread 2" thread_2 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff }
{Thread3 "Thread 3" thread_3 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff }
{Thread4 "Thread 4" thread_4 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff }
{Thread5 "Thread 5" thread_5 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff }
{Thread6 "Thread 6" thread_6 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff }
{Thread7 "Thread 7" thread_7 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff }
{ThreadUnwound "Thread (Unwound)" thread_unwound 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff }
{ThreadError "Thread (Error)" thread_error 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{Breakpoint "Breakpoint" breakpoint 0xa72a12ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff }
{LineInfoBackground0 "Line Info Background 0" line_info_background_0 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""}
{LineInfoBackground1 "Line Info Background 1" line_info_background_1 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""}
{LineInfoBackground2 "Line Info Background 2" line_info_background_2 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""}
{LineInfoBackground3 "Line Info Background 3" line_info_background_3 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f 0xcefd693f ""}
{LineInfoBackground4 "Line Info Background 4" line_info_background_4 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""}
{LineInfoBackground5 "Line Info Background 5" line_info_background_5 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f 0xfe82493f ""}
{LineInfoBackground6 "Line Info Background 6" line_info_background_6 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f 0xffba173f ""}
{LineInfoBackground7 "Line Info Background 7" line_info_background_7 0xcefd693f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f 0x99503d3f ""}
{Thread0 "Thread 0" thread_0 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff 0xffcb7fff ""}
{Thread1 "Thread 1" thread_1 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff 0xb2ff65ff ""}
{Thread2 "Thread 2" thread_2 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff 0xff99e5ff ""}
{Thread3 "Thread 3" thread_3 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff 0x6598ffff ""}
{Thread4 "Thread 4" thread_4 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff 0x65ffcbff ""}
{Thread5 "Thread 5" thread_5 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff 0xff9819ff ""}
{Thread6 "Thread 6" thread_6 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff 0x9932ffff ""}
{Thread7 "Thread 7" thread_7 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff 0x65ff4cff ""}
{ThreadUnwound "Thread (Unwound)" thread_unwound 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff 0xb2ccd8ff ""}
{ThreadError "Thread (Error)" thread_error 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff ""}
{Breakpoint "Breakpoint" breakpoint 0xa72911ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff 0xb23219ff ""}
}
@table(old_name new_name)
src/df/gfx/df_views.c
+26 -39
View File
@@ -1643,11 +1643,13 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
////////////////////////
//- rjf: determine row's color palette
//
UI_BoxFlags row_flags = 0;
UI_Palette *palette = ui_top_palette();
{
if(row_is_fresh)
{
palette = ui_build_palette(ui_top_palette(), .background = mul_4f32(df_rgba_from_theme_color(DF_ThemeColor_Highlight0), v4f32(1, 1, 1, 0.2f)));
palette = ui_build_palette(ui_top_palette(), .background = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay));
row_flags |= UI_BoxFlag_DrawBackground;
}
}
@@ -1659,7 +1661,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
ui_set_next_pref_width(ui_pct(1, 0));
ui_set_next_pref_height(ui_px(scroll_list_params.row_height_px*row->size_in_rows, 1.f));
ui_set_next_focus_hot(row_selected ? UI_FocusKind_On : UI_FocusKind_Off);
UI_Box *row_box = ui_build_box_from_stringf(UI_BoxFlag_DrawSideBottom|UI_BoxFlag_Clickable, "row_%I64x", row_hash);
UI_Box *row_box = ui_build_box_from_stringf(row_flags|UI_BoxFlag_DrawSideBottom|UI_BoxFlag_Clickable|UI_BoxFlag_DisableFocusOverlay, "row_%I64x", row_hash);
ui_ts_vector_idx += 1;
ui_ts_cell_idx = 0;
@@ -1734,7 +1736,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
ui_set_next_fixed_x(0);
ui_set_next_fixed_y(0);
ui_set_next_fixed_height(ui_top_font_size()*0.1f);
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = df_rgba_from_theme_color(DF_ThemeColor_Highlight0)));
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay)));
ui_build_box_from_key(UI_BoxFlag_Floating|UI_BoxFlag_DrawBackground, ui_key_zero());
}
@@ -1753,8 +1755,7 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
ui_set_next_fixed_x(0);
ui_set_next_fixed_y(scroll_list_params.row_height_px - ui_top_font_size()*0.5f);
ui_set_next_fixed_height(ui_top_font_size()*1.f);
Vec4F32 boundary_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
boundary_color.w *= 0.25f;
Vec4F32 boundary_color = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = boundary_color));
ui_build_box_from_key(UI_BoxFlag_Floating|UI_BoxFlag_DrawBackground, ui_key_zero());
}
@@ -1770,15 +1771,6 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
B32 cell_selected = (row_selected && selection_tbl.min.x <= pt.column_kind && pt.column_kind <= selection_tbl.max.x);
B32 can_edit_expr = !(row->depth > 0 || modifiable == 0);
// rjf: unpack palette
UI_Palette *palette = ui_top_palette();
{
if(row->flags & DF_EvalVizRowFlag_ExprIsSpecial)
{
palette = ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextNeutral));
}
}
// rjf: build
UI_Signal sig = {0};
B32 next_expanded = row_expanded;
@@ -1788,14 +1780,8 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
{
B32 expr_editing_active = ui_is_focus_active();
B32 is_inherited = (row->inherited_type_key_chain.count != 0);
UI_Font(code_font) UI_Palette(palette) UI_FlagsAdd(row->depth > 0 ? UI_BoxFlag_DrawTextWeak : 0)
UI_Font(code_font) UI_FlagsAdd(row->depth > 0 ? UI_BoxFlag_DrawTextWeak : 0)
{
if(is_inherited)
{
Vec4F32 inherited_bg_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight1);
inherited_bg_color.w *= 0.2f;
ui_set_next_palette(ui_build_palette(ui_top_palette(), .background = inherited_bg_color));
}
FuzzyMatchRangeList matches = {0};
if(filter.size != 0)
{
@@ -1927,16 +1913,19 @@ df_watch_view_build(DF_Window *ws, DF_Panel *panel, DF_View *view, DF_WatchViewS
B32 value_is_simple = (!value_is_error && !value_is_hook && (row->flags & DF_EvalVizRowFlag_CanEditValue));
// rjf: unpack palette
UI_BoxFlags cell_flags = 0;
UI_Palette *palette = ui_top_palette();
{
if(row_is_bad)
if(row_is_bad || value_is_error)
{
palette = ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextNegative));
palette = ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextNegative), .text_weak = df_rgba_from_theme_color(DF_ThemeColor_TextNegative), .background = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlayError));
cell_flags |= UI_BoxFlag_DrawBackground;
}
}
// rjf: build
UI_Signal sig = {0};
ui_set_next_flags(cell_flags);
UI_Palette(palette) UI_TableCell UI_Font(code_font)
UI_FocusHot(cell_selected ? UI_FocusKind_On : UI_FocusKind_Off)
UI_FocusActive((cell_selected && ewv->text_editing) ? UI_FocusKind_On : UI_FocusKind_Off)
@@ -4706,14 +4695,9 @@ DF_VIEW_UI_FUNCTION_DEF(Scheduler)
UI_TableCellSized(ui_em(1.5f*depth, 1.f)) {}
UI_TableCellSized(ui_em(2.25f, 1.f)) UI_FocusHot((row_is_selected && cursor.x == 0) ? UI_FocusKind_On : UI_FocusKind_Off)
{
B32 frozen_by_solo_mode = (entity->kind == DF_EntityKind_Thread && entity != df_entity_from_handle(ctrl_ctx.thread) && df_state->ctrl_solo_stepping_mode);
B32 frozen = df_entity_is_frozen(entity);
UI_Palette *palette = ui_top_palette();
if(frozen_by_solo_mode)
{
palette = ui_build_palette(ui_top_palette(), .background = df_rgba_from_theme_color(DF_ThemeColor_Highlight0));
}
else if(frozen)
if(frozen)
{
palette = df_palette_from_code(DF_PaletteCode_NegativePopButton);
}
@@ -4723,10 +4707,6 @@ DF_VIEW_UI_FUNCTION_DEF(Scheduler)
}
UI_Signal sig = {0};
UI_Palette(palette) sig = df_icon_buttonf(frozen ? DF_IconKind_Locked : DF_IconKind_Unlocked, 0, "###lock_%p", entity);
if(frozen_by_solo_mode && ui_hovering(sig)) UI_Tooltip
{
ui_label(str8_lit("This thread is frozen during stepping operations because it isn't selected, and Solo Stepping Mode is enabled."));
}
if(ui_clicked(sig))
{
DF_CoreCmdKind cmd_kind = frozen ? DF_CoreCmdKind_ThawEntity : DF_CoreCmdKind_FreezeEntity;
@@ -6460,6 +6440,7 @@ DF_VIEW_UI_FUNCTION_DEF(Code)
ui_set_next_fixed_y(code_area_dim.y);
ui_set_next_fixed_width(panel_box_dim.x - scroll_bar_dim);
ui_set_next_fixed_height(scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.x = ui_scroll_bar(Axis2_X,
ui_px(scroll_bar_dim, 1.f),
@@ -6478,6 +6459,7 @@ DF_VIEW_UI_FUNCTION_DEF(Code)
ui_set_next_fixed_y(0);
ui_set_next_fixed_width(scroll_bar_dim);
ui_set_next_fixed_height(panel_box_dim.y - bottom_bar_dim.y - scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.y = ui_scroll_bar(Axis2_Y,
ui_px(scroll_bar_dim, 1.f),
@@ -6564,7 +6546,7 @@ DF_VIEW_UI_FUNCTION_DEF(Code)
UI_PrefWidth(ui_children_sum(1)) UI_Row UI_PrefWidth(ui_text_dim(1, 1))
{
ui_labelf("This file has changed since ", out_of_date_dbgi_name);
UI_Palette(ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_Highlight0))) ui_label(out_of_date_dbgi_name);
UI_Palette(ui_build_palette(ui_top_palette(), .text = df_rgba_from_theme_color(DF_ThemeColor_TextNeutral))) ui_label(out_of_date_dbgi_name);
ui_labelf(" was produced.");
}
}
@@ -7359,6 +7341,7 @@ DF_VIEW_UI_FUNCTION_DEF(Disassembly)
ui_set_next_fixed_y(code_area_dim.y);
ui_set_next_fixed_width(panel_box_dim.x - scroll_bar_dim);
ui_set_next_fixed_height(scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.x = ui_scroll_bar(Axis2_X,
ui_px(scroll_bar_dim, 1.f),
@@ -7377,6 +7360,7 @@ DF_VIEW_UI_FUNCTION_DEF(Disassembly)
ui_set_next_fixed_y(0);
ui_set_next_fixed_width(scroll_bar_dim);
ui_set_next_fixed_height(panel_box_dim.y - bottom_bar_dim.y - scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.y = ui_scroll_bar(Axis2_Y,
ui_px(scroll_bar_dim, 1.f),
@@ -8160,6 +8144,7 @@ DF_VIEW_UI_FUNCTION_DEF(Output)
ui_set_next_fixed_y(code_area_dim.y);
ui_set_next_fixed_width(panel_box_dim.x - scroll_bar_dim);
ui_set_next_fixed_height(scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.x = ui_scroll_bar(Axis2_X,
ui_px(scroll_bar_dim, 1.f),
@@ -8178,6 +8163,7 @@ DF_VIEW_UI_FUNCTION_DEF(Output)
ui_set_next_fixed_y(0);
ui_set_next_fixed_width(scroll_bar_dim);
ui_set_next_fixed_height(panel_box_dim.y - bottom_bar_dim.y - scroll_bar_dim);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.y = ui_scroll_bar(Axis2_Y,
ui_px(scroll_bar_dim, 1.f),
@@ -8744,6 +8730,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
ui_set_next_fixed_y(content_rect.y0);
ui_set_next_fixed_width(scroll_bar_dim);
ui_set_next_fixed_height(dim_2f32(content_rect).y);
DF_Palette(DF_PaletteCode_ScrollBarButton)
{
view->scroll_pos.y = ui_scroll_bar(Axis2_Y,
ui_px(scroll_bar_dim, 1.f),
@@ -8886,7 +8873,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
if(row_range_bytes.min%64 == 0)
{
row_is_boundary = 1;
row_boundary_color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
row_boundary_color = df_rgba_from_theme_color(DF_ThemeColor_BaseBorder);
}
UI_Box *row = ui_build_box_from_stringf(UI_BoxFlag_DrawSideTop*!!row_is_boundary, "row_%I64x", row_range_bytes.min);
UI_Parent(row)
@@ -8916,7 +8903,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
if(global_byte_num == mouse_hover_byte_num)
{
cell_flags |= UI_BoxFlag_DrawBorder|UI_BoxFlag_DrawSideTop|UI_BoxFlag_DrawSideBottom|UI_BoxFlag_DrawSideLeft|UI_BoxFlag_DrawSideRight;
cell_border_rgba = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
cell_border_rgba = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
}
if(annotation != 0)
{
@@ -8934,7 +8921,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
if(selection.min <= global_byte_idx && global_byte_idx <= selection.max)
{
cell_flags |= UI_BoxFlag_DrawBackground;
cell_bg_rgba = df_rgba_from_theme_color(DF_ThemeColor_Selection);
cell_bg_rgba = df_rgba_from_theme_color(DF_ThemeColor_SelectionOverlay);
}
UI_Box *cell_box = ui_build_box_from_key(UI_BoxFlag_DrawText|cell_flags, ui_key_zero());
ui_box_equip_display_fancy_strings(cell_box, &byte_fancy_strings[byte_value]);
@@ -9006,7 +8993,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
ascii_box->rect.y0,
text_pos.x + f_dim_from_tag_size_string(font, font_size, 0, 0, str8_prefix(ascii_text, selection_in_row.max+1-row_range_bytes.min)).x + font_size/4.f,
ascii_box->rect.y1),
df_rgba_from_theme_color(DF_ThemeColor_Selection),
df_rgba_from_theme_color(DF_ThemeColor_SelectionOverlay),
0, 0, 1.f);
}
ui_box_equip_draw_bucket(ascii_box, bucket);
@@ -9017,7 +9004,7 @@ DF_VIEW_UI_FUNCTION_DEF(Memory)
D_BucketScope(bucket)
{
Vec2F32 text_pos = ui_box_text_position(ascii_box);
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_Highlight0);
Vec4F32 color = df_rgba_from_theme_color(DF_ThemeColor_HighlightOverlay);
d_rect(r2f32p(text_pos.x + f_dim_from_tag_size_string(font, font_size, 0, 0, str8_prefix(ascii_text, mouse_hover_byte_num-1-row_range_bytes.min)).x - font_size/8.f,
ascii_box->rect.y0,
text_pos.x + f_dim_from_tag_size_string(font, font_size, 0, 0, str8_prefix(ascii_text, mouse_hover_byte_num+0-row_range_bytes.min)).x + font_size/4.f,
src/df/gfx/generated/df_gfx.meta.c
+147 -180
View File
@@ -319,25 +319,25 @@ str8_lit_comp("special_neutral_background"),
str8_lit_comp("special_neutral_border"),
};
Vec4F32 df_g_theme_preset_colors__default_dark[78] =
Vec4F32 df_g_theme_preset_colors__default_dark[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x8bff00ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x4dc221ff),
rgba_from_u32_lit_comp(0xc56452ff),
rgba_from_u32_lit_comp(0x307eb2ff),
rgba_from_u32_lit_comp(0xa4a4a4fe),
rgba_from_u32_lit_comp(0x8aff00ff),
rgba_from_u32_lit_comp(0xb23217ff),
rgba_from_u32_lit_comp(0xfea200ff),
rgba_from_u32_lit_comp(0x7bffc7ff),
rgba_from_u32_lit_comp(0xfe9603ff),
rgba_from_u32_lit_comp(0x7bffc7ff),
rgba_from_u32_lit_comp(0xfda200ff),
rgba_from_u32_lit_comp(0xffffffff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xbebebeff),
rgba_from_u32_lit_comp(0x4dc221ff),
rgba_from_u32_lit_comp(0xc56553ff),
rgba_from_u32_lit_comp(0x327fb2ff),
rgba_from_u32_lit_comp(0xa4a4a4fe),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x3b4a515f),
rgba_from_u32_lit_comp(0x5f12005f),
rgba_from_u32_lit_comp(0x1b1b1bfe),
rgba_from_u32_lit_comp(0x2b2b2bfe),
rgba_from_u32_lit_comp(0x3f3f3ffe),
@@ -351,7 +351,7 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x1b1b1bfe),
rgba_from_u32_lit_comp(0x3f3f3ffe),
rgba_from_u32_lit_comp(0x2d7e3eff),
rgba_from_u32_lit_comp(0x2c5b36ff),
rgba_from_u32_lit_comp(0x3f3f3ffd),
rgba_from_u32_lit_comp(0x803425ff),
rgba_from_u32_lit_comp(0x3f3f3ffd),
@@ -359,24 +359,21 @@ rgba_from_u32_lit_comp(0x355b6eff),
rgba_from_u32_lit_comp(0x3f3f3ffd),
rgba_from_u32_lit_comp(0x2b2b2bfe),
rgba_from_u32_lit_comp(0x3f3f3ffe),
rgba_from_u32_lit_comp(0x7b4d27fe),
rgba_from_u32_lit_comp(0xb48300fd),
rgba_from_u32_lit_comp(0x6f5135fe),
rgba_from_u32_lit_comp(0xfefefe4d),
rgba_from_u32_lit_comp(0x3e4c577f),
rgba_from_u32_lit_comp(0xffffff19),
rgba_from_u32_lit_comp(0x3b1f1ffe),
rgba_from_u32_lit_comp(0xbebebeff),
rgba_from_u32_lit_comp(0x7f7f7fff),
rgba_from_u32_lit_comp(0xbebebeff),
rgba_from_u32_lit_comp(0x6093c2ff),
rgba_from_u32_lit_comp(0xecb31aff),
rgba_from_u32_lit_comp(0xadc9e0ff),
rgba_from_u32_lit_comp(0xcbcbcbff),
rgba_from_u32_lit_comp(0x42a2cffe),
rgba_from_u32_lit_comp(0xfec746ff),
rgba_from_u32_lit_comp(0x98bc80ff),
rgba_from_u32_lit_comp(0xb7afd5ff),
rgba_from_u32_lit_comp(0xb18e32ff),
rgba_from_u32_lit_comp(0x7f7f7fff),
rgba_from_u32_lit_comp(0x89b379ff),
rgba_from_u32_lit_comp(0x608752ff),
rgba_from_u32_lit_comp(0x89b379ff),
rgba_from_u32_lit_comp(0x906f81ff),
rgba_from_u32_lit_comp(0xb38d4cff),
rgba_from_u32_lit_comp(0x767676ff),
rgba_from_u32_lit_comp(0x98abb1ff),
rgba_from_u32_lit_comp(0x738287ff),
rgba_from_u32_lit_comp(0x98abb1ff),
rgba_from_u32_lit_comp(0xd96759ff),
rgba_from_u32_lit_comp(0x717171ff),
rgba_from_u32_lit_comp(0x7f7f7fff),
rgba_from_u32_lit_comp(0xbebebeff),
@@ -398,28 +395,28 @@ rgba_from_u32_lit_comp(0x9932ffff),
rgba_from_u32_lit_comp(0x65ff4cff),
rgba_from_u32_lit_comp(0xb2ccd8ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xa72a12ff),
rgba_from_u32_lit_comp(0xa72911ff),
};
Vec4F32 df_g_theme_preset_colors__default_light[78] =
Vec4F32 df_g_theme_preset_colors__default_light[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -445,9 +442,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -483,25 +477,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__vs_dark[78] =
Vec4F32 df_g_theme_preset_colors__vs_dark[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -527,9 +521,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -565,25 +556,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__vs_light[78] =
Vec4F32 df_g_theme_preset_colors__vs_light[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -609,9 +600,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -647,25 +635,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__solarized_dark[78] =
Vec4F32 df_g_theme_preset_colors__solarized_dark[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -691,9 +679,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -729,25 +714,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__solarized_light[78] =
Vec4F32 df_g_theme_preset_colors__solarized_light[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -773,9 +758,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -811,25 +793,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__handmade_hero[78] =
Vec4F32 df_g_theme_preset_colors__handmade_hero[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -855,9 +837,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -893,25 +872,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__four_coder[78] =
Vec4F32 df_g_theme_preset_colors__four_coder[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -937,9 +916,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -975,25 +951,25 @@ rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
};
Vec4F32 df_g_theme_preset_colors__far_manager[78] =
Vec4F32 df_g_theme_preset_colors__far_manager[75] =
{
rgba_from_u32_lit_comp(0xff00ffff),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x32b219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xffffff7f),
rgba_from_u32_lit_comp(0x66e566e5),
rgba_from_u32_lit_comp(0xb23219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0xb27219ff),
rgba_from_u32_lit_comp(0x0000007f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0xffffff0c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x99ccff4c),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x0000003f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xffffff19),
@@ -1019,9 +995,6 @@ rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x00000000),
rgba_from_u32_lit_comp(0x3333337f),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0xe5e5e5ff),
rgba_from_u32_lit_comp(0x7fcc99ff),
rgba_from_u32_lit_comp(0x66b2e5ff),
@@ -1070,25 +1043,25 @@ df_g_theme_preset_colors__four_coder,
df_g_theme_preset_colors__far_manager,
};
String8 df_g_theme_color_display_string_table[78] =
String8 df_g_theme_color_display_string_table[75] =
{
str8_lit_comp("Null"),
str8_lit_comp("Selection"),
str8_lit_comp("Drop Shadow"),
str8_lit_comp("Cursor"),
str8_lit_comp("Cursor (Inactive)"),
str8_lit_comp("Focus"),
str8_lit_comp("Hover"),
str8_lit_comp("Highlight 0"),
str8_lit_comp("Highlight 1"),
str8_lit_comp("Disabled Overlay"),
str8_lit_comp("Drop Site Overlay"),
str8_lit_comp("Inactive Panel Overlay"),
str8_lit_comp("Text"),
str8_lit_comp("Text (Positive)"),
str8_lit_comp("Text (Negative)"),
str8_lit_comp("Text (Neutral)"),
str8_lit_comp("Text (Weak)"),
str8_lit_comp("Cursor"),
str8_lit_comp("Cursor (Inactive)"),
str8_lit_comp("Focus"),
str8_lit_comp("Hover"),
str8_lit_comp("Drop Shadow"),
str8_lit_comp("Disabled Overlay"),
str8_lit_comp("Drop Site Overlay"),
str8_lit_comp("Inactive Panel Overlay"),
str8_lit_comp("Selection Overlay"),
str8_lit_comp("Highlight Overlay"),
str8_lit_comp("Error Highlight Overlay"),
str8_lit_comp("Base Background"),
str8_lit_comp("Base Background (Alternate)"),
str8_lit_comp("Base Border"),
@@ -1114,9 +1087,6 @@ str8_lit_comp("Tab Background"),
str8_lit_comp("Tab Border"),
str8_lit_comp("Tab Background (Inactive)"),
str8_lit_comp("Tab Border (Inactive)"),
str8_lit_comp("Code Background (Negative)"),
str8_lit_comp("Code Line Numbers"),
str8_lit_comp("Code Line Numbers (Inactive)"),
str8_lit_comp("Code (Default)"),
str8_lit_comp("Code (Symbol)"),
str8_lit_comp("Code (Type)"),
@@ -1152,25 +1122,25 @@ str8_lit_comp("Thread (Error)"),
str8_lit_comp("Breakpoint"),
};
String8 df_g_theme_color_cfg_string_table[78] =
String8 df_g_theme_color_cfg_string_table[75] =
{
str8_lit_comp("null"),
str8_lit_comp("selection"),
str8_lit_comp("drop_shadow"),
str8_lit_comp("cursor"),
str8_lit_comp("cursor_inactive"),
str8_lit_comp("focus"),
str8_lit_comp("hover"),
str8_lit_comp("highlight_0"),
str8_lit_comp("highlight_1"),
str8_lit_comp("disabled_overlay"),
str8_lit_comp("drop_site_overlay"),
str8_lit_comp("inactive_panel_overlay"),
str8_lit_comp("text"),
str8_lit_comp("text_positive"),
str8_lit_comp("text_negative"),
str8_lit_comp("text_neutral"),
str8_lit_comp("text_weak"),
str8_lit_comp("cursor"),
str8_lit_comp("cursor_inactive"),
str8_lit_comp("focus"),
str8_lit_comp("hover"),
str8_lit_comp("drop_shadow"),
str8_lit_comp("disabled_overlay"),
str8_lit_comp("drop_site_overlay"),
str8_lit_comp("inactive_panel_overlay"),
str8_lit_comp("selection_overlay"),
str8_lit_comp("highlight_overlay"),
str8_lit_comp("error_highlight_overlay"),
str8_lit_comp("base_background"),
str8_lit_comp("base_background_alt"),
str8_lit_comp("base_border"),
@@ -1196,9 +1166,6 @@ str8_lit_comp("tab_background"),
str8_lit_comp("tab_border"),
str8_lit_comp("tab_background_inactive"),
str8_lit_comp("tab_border_inactive"),
str8_lit_comp("code_background_negative"),
str8_lit_comp("code_line_numbers_active"),
str8_lit_comp("code_line_numbers_inactive"),
str8_lit_comp("code_default"),
str8_lit_comp("code_symbol"),
str8_lit_comp("code_type"),
src/df/gfx/generated/df_gfx.meta.h
+22 -25
View File
@@ -45,22 +45,22 @@ DF_GfxViewKind_COUNT,
typedef enum DF_ThemeColor
{
DF_ThemeColor_Null,
DF_ThemeColor_Selection,
DF_ThemeColor_DropShadow,
DF_ThemeColor_Cursor,
DF_ThemeColor_CursorInactive,
DF_ThemeColor_Focus,
DF_ThemeColor_Hover,
DF_ThemeColor_Highlight0,
DF_ThemeColor_Highlight1,
DF_ThemeColor_DisabledOverlay,
DF_ThemeColor_DropSiteOverlay,
DF_ThemeColor_InactivePanelOverlay,
DF_ThemeColor_Text,
DF_ThemeColor_TextPositive,
DF_ThemeColor_TextNegative,
DF_ThemeColor_TextNeutral,
DF_ThemeColor_TextWeak,
DF_ThemeColor_Cursor,
DF_ThemeColor_CursorInactive,
DF_ThemeColor_Focus,
DF_ThemeColor_Hover,
DF_ThemeColor_DropShadow,
DF_ThemeColor_DisabledOverlay,
DF_ThemeColor_DropSiteOverlay,
DF_ThemeColor_InactivePanelOverlay,
DF_ThemeColor_SelectionOverlay,
DF_ThemeColor_HighlightOverlay,
DF_ThemeColor_HighlightOverlayError,
DF_ThemeColor_BaseBackground,
DF_ThemeColor_BaseBackgroundAlt,
DF_ThemeColor_BaseBorder,
@@ -86,9 +86,6 @@ DF_ThemeColor_TabBackground,
DF_ThemeColor_TabBorder,
DF_ThemeColor_TabBackgroundInactive,
DF_ThemeColor_TabBorderInactive,
DF_ThemeColor_CodeBackgroundNegative,
DF_ThemeColor_CodeLineNumbersActive,
DF_ThemeColor_CodeLineNumbersInactive,
DF_ThemeColor_CodeDefault,
DF_ThemeColor_CodeSymbol,
DF_ThemeColor_CodeType,
@@ -310,18 +307,18 @@ extern String8 df_g_theme_preset_display_string_table[9];
extern String8 df_g_theme_preset_code_string_table[9];
extern String8 df_g_theme_color_version_remap_old_name_table[30];
extern String8 df_g_theme_color_version_remap_new_name_table[30];
extern Vec4F32 df_g_theme_preset_colors__default_dark[78];
extern Vec4F32 df_g_theme_preset_colors__default_light[78];
extern Vec4F32 df_g_theme_preset_colors__vs_dark[78];
extern Vec4F32 df_g_theme_preset_colors__vs_light[78];
extern Vec4F32 df_g_theme_preset_colors__solarized_dark[78];
extern Vec4F32 df_g_theme_preset_colors__solarized_light[78];
extern Vec4F32 df_g_theme_preset_colors__handmade_hero[78];
extern Vec4F32 df_g_theme_preset_colors__four_coder[78];
extern Vec4F32 df_g_theme_preset_colors__far_manager[78];
extern Vec4F32 df_g_theme_preset_colors__default_dark[75];
extern Vec4F32 df_g_theme_preset_colors__default_light[75];
extern Vec4F32 df_g_theme_preset_colors__vs_dark[75];
extern Vec4F32 df_g_theme_preset_colors__vs_light[75];
extern Vec4F32 df_g_theme_preset_colors__solarized_dark[75];
extern Vec4F32 df_g_theme_preset_colors__solarized_light[75];
extern Vec4F32 df_g_theme_preset_colors__handmade_hero[75];
extern Vec4F32 df_g_theme_preset_colors__four_coder[75];
extern Vec4F32 df_g_theme_preset_colors__far_manager[75];
extern Vec4F32* df_g_theme_preset_colors_table[9];
extern String8 df_g_theme_color_display_string_table[78];
extern String8 df_g_theme_color_cfg_string_table[78];
extern String8 df_g_theme_color_display_string_table[75];
extern String8 df_g_theme_color_cfg_string_table[75];
read_only global U8 df_g_icon_font_bytes__data[] =
{
0x00,0x01,0x00,0x00,0x00,0x0f,0x00,0x80,0x00,0x03,0x00,0x70,0x47,0x53,0x55,0x42,0x20,0x8b,0x25,0x7a,0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0x54,0x4f,0x53,0x2f,0x32,0x56,0x44,0x49,0xa0,0x00,0x00,0x01,0x50,0x00,0x00,0x00,0x60,0x63,0x6d,0x61,0x70,0x2a,0x09,0xe2,0xc2,0x00,0x00,0x01,0xb0,0x00,0x00,0x05,0xec,0x63,0x76,0x74,0x20,