simplification/consolidation pass over theme colors

This commit is contained in:
Ryan Fleury
2024-06-24 11:59:19 -07:00
parent 4d2b524400
commit 6d75d6b63b
7 changed files with 520 additions and 643 deletions
+47 -54
View File
@@ -47,57 +47,50 @@ typedef enum DF_ThemeColor
DF_ThemeColor_Null,
DF_ThemeColor_Selection,
DF_ThemeColor_DropShadow,
DF_ThemeColor_CursorActive,
DF_ThemeColor_Cursor,
DF_ThemeColor_CursorInactive,
DF_ThemeColor_FocusActive,
DF_ThemeColor_FocusInactive,
DF_ThemeColor_Focus,
DF_ThemeColor_Hover,
DF_ThemeColor_Highlight0,
DF_ThemeColor_Highlight1,
DF_ThemeColor_DisabledOverlay,
DF_ThemeColor_DefaultText,
DF_ThemeColor_DefaultTextPositive,
DF_ThemeColor_DefaultTextNegative,
DF_ThemeColor_DefaultTextNeutral,
DF_ThemeColor_DefaultTextWeak,
DF_ThemeColor_DefaultBackground,
DF_ThemeColor_DefaultBorder,
DF_ThemeColor_FloatingText,
DF_ThemeColor_FloatingTextPositive,
DF_ThemeColor_FloatingTextNegative,
DF_ThemeColor_FloatingTextWeak,
DF_ThemeColor_FloatingBackground,
DF_ThemeColor_FloatingBorder,
DF_ThemeColor_SpecialPositiveText,
DF_ThemeColor_SpecialPositiveTextWeak,
DF_ThemeColor_SpecialPositiveBackground,
DF_ThemeColor_SpecialPositiveBorder,
DF_ThemeColor_SpecialNegativeText,
DF_ThemeColor_SpecialNegativeTextWeak,
DF_ThemeColor_SpecialNegativeBackground,
DF_ThemeColor_SpecialNegativeBorder,
DF_ThemeColor_SpecialNeutralText,
DF_ThemeColor_SpecialNeutralTextWeak,
DF_ThemeColor_SpecialNeutralBackground,
DF_ThemeColor_SpecialNeutralBorder,
DF_ThemeColor_MenuBarText,
DF_ThemeColor_MenuBarTextWeak,
DF_ThemeColor_MenuBarTextPositive,
DF_ThemeColor_MenuBarTextNegative,
DF_ThemeColor_DropSiteOverlay,
DF_ThemeColor_InactivePanelOverlay,
DF_ThemeColor_Text,
DF_ThemeColor_TextPositive,
DF_ThemeColor_TextNegative,
DF_ThemeColor_TextNeutral,
DF_ThemeColor_TextWeak,
DF_ThemeColor_BaseBackground,
DF_ThemeColor_BaseBackgroundAlt,
DF_ThemeColor_BaseBorder,
DF_ThemeColor_MenuBarBackground,
DF_ThemeColor_MenuBarBackgroundAlt,
DF_ThemeColor_MenuBarBorder,
DF_ThemeColor_TabActiveText,
DF_ThemeColor_TabActiveTextWeak,
DF_ThemeColor_TabActiveBackground,
DF_ThemeColor_TabActiveBorder,
DF_ThemeColor_TabInactiveText,
DF_ThemeColor_TabInactiveTextWeak,
DF_ThemeColor_TabInactiveBackground,
DF_ThemeColor_TabInactiveBorder,
DF_ThemeColor_FloatingBackground,
DF_ThemeColor_FloatingBackgroundAlt,
DF_ThemeColor_FloatingBorder,
DF_ThemeColor_ImplicitButtonBackground,
DF_ThemeColor_ImplicitButtonBorder,
DF_ThemeColor_PlainButtonBackground,
DF_ThemeColor_PlainButtonBorder,
DF_ThemeColor_PositivePopButtonBackground,
DF_ThemeColor_PositivePopButtonBorder,
DF_ThemeColor_NegativePopButtonBackground,
DF_ThemeColor_NegativePopButtonBorder,
DF_ThemeColor_NeutralPopButtonBackground,
DF_ThemeColor_NeutralPopButtonBorder,
DF_ThemeColor_ScrollBarButtonBackground,
DF_ThemeColor_ScrollBarButtonBorder,
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_CodeProcedure,
DF_ThemeColor_CodeSymbol,
DF_ThemeColor_CodeType,
DF_ThemeColor_CodeLocal,
DF_ThemeColor_CodeRegister,
@@ -108,6 +101,8 @@ DF_ThemeColor_CodeNumericAltDigitGroup,
DF_ThemeColor_CodeString,
DF_ThemeColor_CodeMeta,
DF_ThemeColor_CodeComment,
DF_ThemeColor_CodeLineNumbers,
DF_ThemeColor_CodeLineNumbersSelected,
DF_ThemeColor_LineInfoBackground0,
DF_ThemeColor_LineInfoBackground1,
DF_ThemeColor_LineInfoBackground2,
@@ -127,8 +122,6 @@ DF_ThemeColor_Thread7,
DF_ThemeColor_ThreadUnwound,
DF_ThemeColor_ThreadError,
DF_ThemeColor_Breakpoint,
DF_ThemeColor_DropSiteOverlay,
DF_ThemeColor_InactivePanelOverlay,
DF_ThemeColor_COUNT,
} DF_ThemeColor;
@@ -317,18 +310,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[85];
extern Vec4F32 df_g_theme_preset_colors__default_light[85];
extern Vec4F32 df_g_theme_preset_colors__vs_dark[85];
extern Vec4F32 df_g_theme_preset_colors__vs_light[85];
extern Vec4F32 df_g_theme_preset_colors__solarized_dark[85];
extern Vec4F32 df_g_theme_preset_colors__solarized_light[85];
extern Vec4F32 df_g_theme_preset_colors__handmade_hero[85];
extern Vec4F32 df_g_theme_preset_colors__four_coder[85];
extern Vec4F32 df_g_theme_preset_colors__far_manager[85];
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_table[9];
extern String8 df_g_theme_color_display_string_table[85];
extern String8 df_g_theme_color_cfg_string_table[85];
extern String8 df_g_theme_color_display_string_table[78];
extern String8 df_g_theme_color_cfg_string_table[78];
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,