From 9758d83856c29c3befe90d1dfa50266aef27fb77 Mon Sep 17 00:00:00 2001 From: Krzosa Karol Date: Wed, 31 Dec 2025 15:33:32 +0100 Subject: [PATCH] Rename colors --- src/text_editor/draw.cpp | 44 ++++++++++++++++----------------- src/text_editor/globals.cpp | 43 ++++++++++++++++---------------- src/text_editor/text_editor.cpp | 2 +- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/text_editor/draw.cpp b/src/text_editor/draw.cpp index 87f0858..c006e44 100644 --- a/src/text_editor/draw.cpp +++ b/src/text_editor/draw.cpp @@ -109,20 +109,20 @@ void DrawWindow(Window *window, Event &event) { bool is_active = window->id == ActiveWindowID; bool active_layed_out_doc = window->id == LastActiveLayoutWindowID; - Color color_whitespace_during_selection = ColorWhitespaceDuringSelection; - Color color_background = ColorBackground; - Color color_line_highlight = ColorLineHighlight; - Color color_selection = ColorSelection; - Color color_main_caret = ColorMainCaret; - Color color_sub_caret = ColorSubCaret; - Color color_text_line_numbers = ColorTextLineNumbers; - Color color_text = ColorText; + Color color_whitespace_during_selection = SelectedWhitespaceColor; + Color color_background = BackgroundColor; + Color color_line_highlight = LineHighlightColor; + Color color_selection = SelectionColor; + Color color_main_caret = PrimaryCaretColor; + Color color_sub_caret = SecondaryCaretColor; + Color color_text_line_numbers = LineNumberTextColor; + Color color_text = TextColor; if (window->draw_darker) { - color_background = ColorTitleBarBackground; - color_selection = ColorTitleBarSelection; - color_text = ColorTitleBarText; - color_line_highlight = ColorTitleBarLineHighlight; + color_background = SecondaryWindowStyle_BackgroundColor; + color_selection = SecondaryWindowStyle_SelectionColor; + color_text = SecondaryWindowStyle_TextColor; + color_line_highlight = SecondaryWindowStyle_LineHighlightColor; } @@ -210,7 +210,7 @@ void DrawWindow(Window *window, Event &event) { if (p != -1) { Range range = EncloseLoadWord(buffer, p); if (InBounds(caret.range, p)) range = caret.range; - DrawUnderline(window, view, buffer, range, ColorMouseUnderline, 2); + DrawUnderline(window, view, buffer, range, MouseUnderlineColor, 2); } } @@ -218,9 +218,9 @@ void DrawWindow(Window *window, Event &event) { if (is_active) { if (GetSize(caret.range) == 0) { Range range = EncloseLoadWord(buffer, caret.range.min); - DrawUnderline(window, view, buffer, range, ColorCaretUnderline); + DrawUnderline(window, view, buffer, range, CaretUnderlineColor); } else { - DrawUnderline(window, view, buffer, caret.range, ColorCaretUnderline); + DrawUnderline(window, view, buffer, caret.range, CaretUnderlineColor); } } } @@ -272,11 +272,11 @@ void DrawWindow(Window *window, Event &event) { if (DrawScrollbar && window->draw_scrollbar) { ProfileScope(DrawScrollbar); SetScissor(window->scrollbar_rect); - DrawRect(window->scrollbar_rect, ColorScrollbarBackground); + DrawRect(window->scrollbar_rect, ScrollbarBackgroundColor); Scroller scroller = ComputeScrollerRect(window); Rect2 rect = Shrink(scroller.rect, 2); - Color color = ColorScrollbarScroller; - if (ScrollbarSelected.id == window->id.id) color = ColorScrollbarScrollerSelected; + Color color = ScrollerColor; + if (ScrollbarSelected.id == window->id.id) color = ScrollerSelectedColor; DrawRect(rect, color); } @@ -290,21 +290,21 @@ void DrawWindow(Window *window, Event &event) { if (window->draw_darker) { SetScissor(window->total_rect); Rect2I rect = window->total_rect; - DrawRect(CutTop(&rect, 1), ColorTitleBarOutline); + DrawRect(CutTop(&rect, 1), SecondaryWindowStyle_OutlineColor); } // darken the inactive windows if (!is_active && !active_layed_out_doc) { ProfileScope(DarkenInactiveRect); SetScissor(screen_rect); - DrawRect(window->total_rect, ColorInactiveWindow); + DrawRect(window->total_rect, InactiveWindowColor); } // Draw resizer rect if (GetSize(window->resizer_rect).x > 0){ Rect2I rect = window->resizer_rect; SetScissor(window->resizer_rect); - DrawRect(rect, ColorResizerBackground); - DrawRect(CutRight(&rect, 1), ColorResizerOutline); + DrawRect(rect, ResizerBackgroundColor); + DrawRect(CutRight(&rect, 1), ResizerOutlineColor); } } diff --git a/src/text_editor/globals.cpp b/src/text_editor/globals.cpp index 5f637f7..882ef59 100644 --- a/src/text_editor/globals.cpp +++ b/src/text_editor/globals.cpp @@ -131,28 +131,27 @@ Color GruvboxFadedBlue = {0x07, 0x66, 0x78, 0xff}; Color GruvboxFadedPurple = {0x8f, 0x3f, 0x71, 0xff}; Color GruvboxFadedAqua = {0x42, 0x7b, 0x58, 0xff}; Color GruvboxFadedOrange = {0xaf, 0x3a, 0x03, 0xff}; -RegisterVariable(Color, ColorText, GruvboxDark0Hard); -RegisterVariable(Color, ColorLoadTextHighlight, {0x00, 0x00, 0x00, 0x0F}); -RegisterVariable(Color, ColorBackground, GruvboxLight0Hard); -RegisterVariable(Color, ColorInactiveWindow, {0x00, 0x00, 0x00, 0x1F}); -RegisterVariable(Color, ColorTextLineNumbers, GruvboxDark4); -RegisterVariable(Color, ColorLineHighlight, GruvboxLight0Soft); -RegisterVariable(Color, ColorMainCaret, GruvboxDark0Hard); -RegisterVariable(Color, ColorSubCaret, GruvboxGray245); -RegisterVariable(Color, ColorSelection, GruvboxLight1); -RegisterVariable(Color, ColorWhitespaceDuringSelection, GruvboxLight4); -RegisterVariable(Color, ColorMouseUnderline, GruvboxDark0Hard); -RegisterVariable(Color, ColorCaretUnderline, GruvboxGray245); -RegisterVariable(Color, ColorScrollbarBackground, GruvboxLight2); -RegisterVariable(Color, ColorScrollbarScroller, GruvboxLight1); -RegisterVariable(Color, ColorScrollbarScrollerSelected, GruvboxLight0Hard); -RegisterVariable(Color, ColorTitleBarText, GruvboxDark0Hard); -RegisterVariable(Color, ColorTitleBarBackground, GruvboxLight0Hard); -RegisterVariable(Color, ColorTitleBarSelection, GruvboxLight3); -RegisterVariable(Color, ColorTitleBarLineHighlight, GruvboxLight0Soft); -RegisterVariable(Color, ColorTitleBarOutline, GruvboxLight3); -RegisterVariable(Color, ColorResizerBackground, GruvboxLight0Hard); -RegisterVariable(Color, ColorResizerOutline, GruvboxLight3); +RegisterVariable(Color, TextColor, GruvboxDark0Hard); +RegisterVariable(Color, BackgroundColor, GruvboxLight0Hard); +RegisterVariable(Color, InactiveWindowColor, {0x00, 0x00, 0x00, 0x1F}); +RegisterVariable(Color, LineNumberTextColor, GruvboxDark4); +RegisterVariable(Color, LineHighlightColor, GruvboxLight0Soft); +RegisterVariable(Color, PrimaryCaretColor, GruvboxDark0Hard); +RegisterVariable(Color, SecondaryCaretColor, GruvboxGray245); +RegisterVariable(Color, SelectionColor, GruvboxLight1); +RegisterVariable(Color, SelectedWhitespaceColor, GruvboxLight4); +RegisterVariable(Color, MouseUnderlineColor, GruvboxDark0Hard); +RegisterVariable(Color, CaretUnderlineColor, GruvboxGray245); +RegisterVariable(Color, ScrollbarBackgroundColor, GruvboxLight2); +RegisterVariable(Color, ScrollerColor, GruvboxLight1); +RegisterVariable(Color, ScrollerSelectedColor, GruvboxLight0Hard); +RegisterVariable(Color, SecondaryWindowStyle_TextColor, GruvboxDark0Hard); +RegisterVariable(Color, SecondaryWindowStyle_BackgroundColor, GruvboxLight0Hard); +RegisterVariable(Color, SecondaryWindowStyle_SelectionColor, GruvboxLight3); +RegisterVariable(Color, SecondaryWindowStyle_LineHighlightColor, GruvboxLight0Soft); +RegisterVariable(Color, SecondaryWindowStyle_OutlineColor, GruvboxLight3); +RegisterVariable(Color, ResizerBackgroundColor, GruvboxLight0Hard); +RegisterVariable(Color, ResizerOutlineColor, GruvboxLight3); RegisterVariable(Int, WaitForEvents, 1); RegisterVariable(Int, DrawLineNumbers, 1); RegisterVariable(Int, DrawScrollbar, 1); diff --git a/src/text_editor/text_editor.cpp b/src/text_editor/text_editor.cpp index bb44cb4..1afd6ed 100644 --- a/src/text_editor/text_editor.cpp +++ b/src/text_editor/text_editor.cpp @@ -728,7 +728,7 @@ void MainLoop() { if (!it->visible) continue; DrawWindow(it, *GetLast(frame_events)); } - EndFrameRender(event->xwindow, event->ywindow, ColorBackground); + EndFrameRender(event->xwindow, event->ywindow, BackgroundColor); SDL_GL_SwapWindow(SDLWindow); }