From dcda334767797eb707ead4c23957a61663eb00ac Mon Sep 17 00:00:00 2001 From: Krzosa Karol Date: Fri, 16 Jan 2026 20:51:10 +0100 Subject: [PATCH] Cut down on header files --- src/text_editor/draw.cpp | 2 ++ src/text_editor/globals.cpp | 20 -------------------- src/text_editor/plugin_build_window.cpp | 5 +++++ src/text_editor/plugin_build_window.h | 3 --- src/text_editor/plugin_command_window.cpp | 3 +++ src/text_editor/plugin_command_window.h | 3 --- src/text_editor/plugin_debug_window.cpp | 5 +++++ src/text_editor/plugin_debug_window.h | 4 ---- src/text_editor/plugin_status_window.cpp | 3 +++ src/text_editor/plugin_status_window.h | 4 ---- src/text_editor/text_editor.cpp | 4 ---- 11 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 src/text_editor/plugin_build_window.h delete mode 100644 src/text_editor/plugin_command_window.h delete mode 100644 src/text_editor/plugin_debug_window.h delete mode 100644 src/text_editor/plugin_status_window.h diff --git a/src/text_editor/draw.cpp b/src/text_editor/draw.cpp index 7c89a12..de057e0 100644 --- a/src/text_editor/draw.cpp +++ b/src/text_editor/draw.cpp @@ -263,10 +263,12 @@ void DrawWindow(Window *window, Event &event) { } } +#ifdef PLUGIN_SEARCH_WINDOW if (SearchWindowID == window->id) { SetScissor(window->line_numbers_rect); DrawString(window->font, u"Find: ", ToVec2(window->line_numbers_rect.min), color_text_line_numbers); } +#endif // Draw scrollbar if (DrawScrollbar && window->draw_scrollbar) { diff --git a/src/text_editor/globals.cpp b/src/text_editor/globals.cpp index e3db645..0437c28 100644 --- a/src/text_editor/globals.cpp +++ b/src/text_editor/globals.cpp @@ -33,32 +33,12 @@ BufferID NullBufferID; ViewID NullViewID; WindowID NullWindowID; -#ifdef PLUGIN_DEBUG_WINDOW - WindowID DebugWindowID; - ViewID DebugViewID; - BufferID DebugBufferID; -#endif - -#ifdef PLUGIN_COMMAND_WINDOW - WindowID CommandWindowID; -#endif - #ifdef PLUGIN_SEARCH_WINDOW WindowID SearchWindowID; ViewID SearchViewID; BufferID SearchBufferID; #endif -#ifdef PLUGIN_STATUS_WINDOW - WindowID StatusWindowID; -#endif - -#ifdef PLUGIN_BUILD_WINDOW - WindowID BuildWindowID; - ViewID BuildViewID; - BufferID BuildBufferID; -#endif - BufferID GlobalConfigBufferID; WindowID NextActiveWindowID; diff --git a/src/text_editor/plugin_build_window.cpp b/src/text_editor/plugin_build_window.cpp index 48bf08d..5b11de4 100644 --- a/src/text_editor/plugin_build_window.cpp +++ b/src/text_editor/plugin_build_window.cpp @@ -1,3 +1,8 @@ +#define PLUGIN_BUILD_WINDOW +WindowID BuildWindowID; +ViewID BuildViewID; +BufferID BuildBufferID; + void InitBuildWindow() { Window *window = CreateWind(); BuildWindowID = window->id; diff --git a/src/text_editor/plugin_build_window.h b/src/text_editor/plugin_build_window.h deleted file mode 100644 index 438d709..0000000 --- a/src/text_editor/plugin_build_window.h +++ /dev/null @@ -1,3 +0,0 @@ -#define PLUGIN_BUILD_WINDOW -void InitBuildWindow(); -void LayoutBuildWindow(Rect2I *rect, int16_t wx, int16_t wy); diff --git a/src/text_editor/plugin_command_window.cpp b/src/text_editor/plugin_command_window.cpp index dc9f8e4..1bbe2a8 100644 --- a/src/text_editor/plugin_command_window.cpp +++ b/src/text_editor/plugin_command_window.cpp @@ -1,3 +1,6 @@ +#define PLUGIN_COMMAND_WINDOW +WindowID CommandWindowID; + void CMD_ShowCommands() { // @todo: maybe redo this, similar behavior but use View stored information // if (ActiveWindowID == CommandWindowID && LastExecutedManualCommand == CMD_ShowCommands) { diff --git a/src/text_editor/plugin_command_window.h b/src/text_editor/plugin_command_window.h deleted file mode 100644 index b686d47..0000000 --- a/src/text_editor/plugin_command_window.h +++ /dev/null @@ -1,3 +0,0 @@ -#define PLUGIN_COMMAND_WINDOW -void InitCommandWindow(); -void LayoutCommandWindow(Rect2I *rect, int16_t wx, int16_t wy); \ No newline at end of file diff --git a/src/text_editor/plugin_debug_window.cpp b/src/text_editor/plugin_debug_window.cpp index b2891e5..274ccc8 100644 --- a/src/text_editor/plugin_debug_window.cpp +++ b/src/text_editor/plugin_debug_window.cpp @@ -1,3 +1,8 @@ +#define PLUGIN_DEBUG_WINDOW +WindowID DebugWindowID; +ViewID DebugViewID; +BufferID DebugBufferID; + void InitDebugWindow() { Window *window = CreateWind(); DebugWindowID = window->id; diff --git a/src/text_editor/plugin_debug_window.h b/src/text_editor/plugin_debug_window.h deleted file mode 100644 index 6bdc788..0000000 --- a/src/text_editor/plugin_debug_window.h +++ /dev/null @@ -1,4 +0,0 @@ -#define PLUGIN_DEBUG_WINDOW -void InitDebugWindow(); -void LayoutDebugWindow(Rect2I *rect, int16_t wx, int16_t wy); -void UpdateDebugWindow(); \ No newline at end of file diff --git a/src/text_editor/plugin_status_window.cpp b/src/text_editor/plugin_status_window.cpp index 89fe2f6..683fcfe 100644 --- a/src/text_editor/plugin_status_window.cpp +++ b/src/text_editor/plugin_status_window.cpp @@ -1,3 +1,6 @@ +#define PLUGIN_STATUS_WINDOW +WindowID StatusWindowID; + void InitStatusWindow() { Window *window = CreateWind(); StatusWindowID = window->id; diff --git a/src/text_editor/plugin_status_window.h b/src/text_editor/plugin_status_window.h deleted file mode 100644 index 95bbc6f..0000000 --- a/src/text_editor/plugin_status_window.h +++ /dev/null @@ -1,4 +0,0 @@ -#define PLUGIN_STATUS_WINDOW -void InitStatusWindow(); -void LayoutStatusWindow(Rect2I *rect, int16_t wx, int16_t wy); -void UpdateStatusWindow(); \ No newline at end of file diff --git a/src/text_editor/text_editor.cpp b/src/text_editor/text_editor.cpp index 8517ca0..692ce7f 100644 --- a/src/text_editor/text_editor.cpp +++ b/src/text_editor/text_editor.cpp @@ -16,11 +16,7 @@ #include "render/opengl.cpp" #include "plugin_directory_navigation.h" #include "text_editor.h" -#include "plugin_command_window.h" #include "plugin_search_window.h" -#include "plugin_debug_window.h" -#include "plugin_status_window.h" -#include "plugin_build_window.h" #include "plugin_project_management.h" #if OS_WINDOWS #include "plugin_remedybg.h"