From 586b3e3072b0a77ebffdace82c9e57938094978f Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Mon, 24 Jun 2024 15:32:50 -0700 Subject: [PATCH] fix incorrect margin measurement in output view --- src/df/gfx/df_gfx.mdesk | 3 +-- src/df/gfx/df_views.c | 4 ++-- src/df/gfx/generated/df_gfx.meta.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/df/gfx/df_gfx.mdesk b/src/df/gfx/df_gfx.mdesk index d331a67b..40ff39da 100644 --- a/src/df/gfx/df_gfx.mdesk +++ b/src/df/gfx/df_gfx.mdesk @@ -386,8 +386,7 @@ DF_ThemeColorTable: {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 ""} + {HighlightOverlay "Highlight Overlay" highlight_overlay 0xffffff1e 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 diff --git a/src/df/gfx/df_views.c b/src/df/gfx/df_views.c index 3b60d407..cf74a5a7 100644 --- a/src/df/gfx/df_views.c +++ b/src/df/gfx/df_views.c @@ -7805,8 +7805,8 @@ DF_VIEW_UI_FUNCTION_DEF(Output) code_slice_params.tab_size = code_tab_size; code_slice_params.line_height_px = code_line_height; code_slice_params.search_query = search_query; - code_slice_params.priority_margin_width_px = priority_margin_width_px; - code_slice_params.catchall_margin_width_px = catchall_margin_width_px; + code_slice_params.priority_margin_width_px = 0.f; + code_slice_params.catchall_margin_width_px = 0.f; code_slice_params.line_num_width_px = line_num_width_px; code_slice_params.line_text_max_width_px = (F32)line_size_x; code_slice_params.flash_ranges = df_push_entity_child_list_with_kind(scratch.arena, entity, DF_EntityKind_FlashMarker); diff --git a/src/df/gfx/generated/df_gfx.meta.c b/src/df/gfx/generated/df_gfx.meta.c index 9e327f41..d79299c9 100644 --- a/src/df/gfx/generated/df_gfx.meta.c +++ b/src/df/gfx/generated/df_gfx.meta.c @@ -336,7 +336,7 @@ 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(0x3b4a515f), +rgba_from_u32_lit_comp(0xffffff1e), rgba_from_u32_lit_comp(0x5f12005f), rgba_from_u32_lit_comp(0x1b1b1bfe), rgba_from_u32_lit_comp(0x2b2b2bfe),