From 0221f06d5cc87008b4c20bd913d1a83f7659fc73 Mon Sep 17 00:00:00 2001 From: Daniel Dada Date: Mon, 2 Feb 2026 23:36:20 +0300 Subject: [PATCH] updated color table --- README.md | 1 + extra/templates/text-editors/vscode/code.json | 36 ++++++++--------- src/gui/views/color_table_renderer.cpp | 40 +++++++++++++++---- 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index b7da9b1..a58c8d7 100644 --- a/README.md +++ b/README.md @@ -471,6 +471,7 @@ You may find some pre-configured color schemes and templates in [extra](extra) d ## Acknowledgments - **[matugen](https://github.com/InioX/matugen)** - A material you color generation tool +- **[hellwal](https://github.com/danihek/hellwal)** - Pywal-like color palette generator, but faster and in C - **[Dear ImGui](https://github.com/ocornut/imgui)** - Bloat-free graphical user interface library for C++ - **[GLFW](https://www.glfw.org/)** - Multi-platform library for OpenGL, OpenGL ES and Vulkan development - **[toml++](https://github.com/marzer/tomlplusplus)** - Header-only TOML config file parser and serializer for C++17 diff --git a/extra/templates/text-editors/vscode/code.json b/extra/templates/text-editors/vscode/code.json index 95af9a4..1d4ca29 100644 --- a/extra/templates/text-editors/vscode/code.json +++ b/extra/templates/text-editors/vscode/code.json @@ -1849,7 +1849,7 @@ "scrollbar.shadow": "{background}", "activityBar.foreground": "{on_surface}", "activityBar.background": "{surface}", - "activityBar.inactiveForeground": "{editor_comment}", + "activityBar.inactiveForeground": "{on_surface_variant}", "activityBarBadge.foreground": "{foreground}", "activityBarBadge.background": "{accent}", "sideBar.background": "{surface}", @@ -1858,7 +1858,7 @@ "sideBarSectionHeader.background": "{border}", "sideBarSectionHeader.foreground": "{on_surface}", "sideBarSectionHeader.border": "{border}33", - "sideBarTitle.foreground": "{editor_comment}", + "sideBarTitle.foreground": "{on_surface_variant}", "list.inactiveSelectionBackground": "{surface_variant}", "list.inactiveSelectionForeground": "{on_surface}", "list.hoverBackground": "{surface_variant}", @@ -1873,19 +1873,19 @@ "listFilterWidget.background": "{base03}", "listFilterWidget.outline": "{border}", "listFilterWidget.noMatchesOutline": "{error}", - "statusBar.foreground": "{foreground}", - "statusBar.background": "{accent}", - "statusBarItem.hoverBackground": "{foreground}1f", + "statusBar.foreground": "{on_surface}", + "statusBar.background": "{surface}", + "statusBarItem.hoverBackground": "{surface_variant}", "statusBar.debuggingBackground": "{warning}", - "statusBar.debuggingForeground": "{foreground}", - "statusBar.noFolderBackground": "{base05}", - "statusBar.noFolderForeground": "{foreground}", - "statusBarItem.remoteBackground": "{success}", + "statusBar.debuggingForeground": "{on_warning}", + "statusBar.noFolderBackground": "{surface}", + "statusBar.noFolderForeground": "{on_surface}", + "statusBarItem.remoteBackground": "{accent}", "statusBarItem.remoteForeground": "{foreground}", "titleBar.activeBackground": "{background}", "titleBar.activeForeground": "{on_background}", "titleBar.inactiveBackground": "{background}", - "titleBar.inactiveForeground": "{editor_comment}", + "titleBar.inactiveForeground": "{on_surface_variant}", "titleBar.border": "{border}", "menubar.selectionForeground": "{on_surface}", "menubar.selectionBackground": "{foreground}1a", @@ -1894,7 +1894,7 @@ "menu.selectionForeground": "{foreground}", "menu.selectionBackground": "{editor_selection}", "menu.selectionBorder": "{border}", - "menu.separatorBackground": "{editor_comment}", + "menu.separatorBackground": "{border}", "menu.border": "{border}85", "button.background": "{accent}", "button.foreground": "{foreground}", @@ -1908,7 +1908,7 @@ "inputOption.activeBackground": "{accent}66", "inputOption.activeBorder": "{border}00", "inputOption.activeForeground": "{foreground}", - "input.placeholderForeground": "{editor_comment}", + "input.placeholderForeground": "{on_surface_variant}", "textLink.foreground": "{editor_link}", "editor.background": "{editor_background}", "editor.foreground": "{editor_foreground}", @@ -1957,7 +1957,7 @@ "editorGutter.addedBackground": "{editor_inserted}", "editorGutter.deletedBackground": "{editor_deleted}", "editorGutter.foldingControlForeground": "{editor_line_number}", - "editorCodeLens.foreground": "{editor_comment}", + "editorCodeLens.foreground": "{on_surface_variant}", "editorGroup.border": "{border}", "diffEditor.insertedTextBackground": "{editor_inserted}33", "diffEditor.removedTextBackground": "{editor_deleted}33", @@ -1966,7 +1966,7 @@ "panel.border": "{border}", "panelTitle.activeBorder": "{accent}", "panelTitle.activeForeground": "{on_surface}", - "panelTitle.inactiveForeground": "{editor_comment}", + "panelTitle.inactiveForeground": "{on_surface_variant}", "badge.background": "{surface_variant}", "badge.foreground": "{foreground}", "terminal.foreground": "{on_surface}", @@ -1991,7 +1991,7 @@ "terminal.ansiWhite": "{on_surface}", "terminal.ansiYellow": "{base0B}", "breadcrumb.background": "{editor_background}", - "breadcrumb.foreground": "{on_surface}cc", + "breadcrumb.foreground": "{on_surface_variant}", "breadcrumb.focusForeground": "{on_surface}", "editorGroupHeader.tabsBackground": "{surface}", "tab.activeForeground": "{foreground}", @@ -2000,7 +2000,7 @@ "tab.activeBorder": "{border}", "tab.activeBorderTop": "{border}", "tab.inactiveBackground": "{surface_variant}", - "tab.inactiveForeground": "{editor_comment}", + "tab.inactiveForeground": "{on_surface_variant}", "scrollbarSlider.background": "{border}66", "scrollbarSlider.hoverBackground": "{border_focused}b3", "scrollbarSlider.activeBackground": "{on_surface}66", @@ -2026,7 +2026,7 @@ "gitDecoration.addedResourceForeground": "{editor_inserted}", "gitDecoration.conflictingResourceForeground": "{editor_warning}", "gitDecoration.deletedResourceForeground": "{editor_deleted}", - "gitDecoration.ignoredResourceForeground": "{editor_ignored}", + "gitDecoration.ignoredResourceForeground": "{on_surface_variant}", "gitDecoration.modifiedResourceForeground": "{editor_modified}", "gitDecoration.stageDeletedResourceForeground": "{editor_deleted}", "gitDecoration.stageModifiedResourceForeground": "{editor_modified}", @@ -2057,7 +2057,7 @@ "peekViewEditor.matchHighlightBorder": "{warning}", "peekViewResult.background": "{surface}", "peekViewResult.fileForeground": "{foreground}", - "peekViewResult.lineForeground": "{editor_comment}", + "peekViewResult.lineForeground": "{on_surface_variant}", "peekViewResult.matchHighlightBackground": "{warning}4d", "peekViewResult.selectionBackground": "{info}33", "peekViewResult.selectionForeground": "{foreground}", diff --git a/src/gui/views/color_table_renderer.cpp b/src/gui/views/color_table_renderer.cpp index 64dc945..63b95b0 100644 --- a/src/gui/views/color_table_renderer.cpp +++ b/src/gui/views/color_table_renderer.cpp @@ -184,19 +184,43 @@ void color_table_renderer::render(const clrsync::core::palette ¤t, draw_table("General UI", "##general_ui", {"background", "on_background", "surface", "on_surface", "surface_variant", - "on_surface_variant", "foreground", "cursor", "accent", "accent_secondary"}); - - draw_table("Borders", "##borders", {"border_focused", "border"}); + "on_surface_variant", "border_focused", "border", "foreground", "cursor", "accent", + "accent_secondary"}); draw_table( "Semantic Colors", "##semantic", {"success", "info", "warning", "error", "on_success", "on_info", "on_warning", "on_error"}); - draw_table("Editor", "##editor", - {"editor_background", "editor_command", "editor_comment", "editor_disabled", - "editor_emphasis", "editor_error", "editor_inactive", "editor_line_number", - "editor_link", "editor_main", "editor_selected", "editor_selection_inactive", - "editor_string", "editor_success", "editor_warning"}); + draw_table("Editor - Basic", "##editor_basic", + {"editor_background", "editor_foreground", "editor_line_highlight", + "editor_selection", "editor_selection_inactive", "editor_cursor", + "editor_whitespace"}); + + draw_table("Editor - Gutter", "##editor_gutter", + {"editor_gutter_background", "editor_gutter_foreground", "editor_line_number", + "editor_line_number_active"}); + + draw_table("Editor - Syntax", "##editor_syntax", + {"editor_comment", "editor_string", "editor_number", "editor_boolean", + "editor_keyword", "editor_operator", "editor_function", "editor_variable", + "editor_parameter", "editor_property", "editor_constant", "editor_type", + "editor_class", "editor_interface", "editor_enum", "editor_namespace", + "editor_attribute", "editor_decorator", "editor_tag", "editor_punctuation", + "editor_link", "editor_regex", "editor_escape_character"}); + + draw_table("Editor - Diagnostics", "##editor_diagnostics", + {"editor_invalid", "editor_error", "editor_error_background", "editor_warning", + "editor_warning_background", "editor_info", "editor_info_background", + "editor_hint", "editor_hint_background"}); + + draw_table("Editor - UI Elements", "##editor_ui", + {"editor_active_line_border", "editor_indent_guide", "editor_indent_guide_active", + "editor_bracket_match", "editor_search_match", "editor_search_match_active", + "editor_find_range_highlight"}); + + draw_table("Editor - Diff", "##editor_diff", + {"editor_deleted", "editor_inserted", "editor_modified", "editor_ignored", + "editor_folded_background"}); draw_table("Terminal (Base16)", "##terminal", {"base00", "base01", "base02", "base03", "base04", "base05", "base06", "base07",