From 6f9299e55766900bca8c9d75faa412a1dd5ccf7f Mon Sep 17 00:00:00 2001 From: Krzosa Karol Date: Fri, 26 Dec 2025 21:01:54 +0100 Subject: [PATCH] Misc changes --- src/text_editor/text_editor.cpp | 6 ------ src/text_editor/window.cpp | 8 ++++---- src/text_editor/window.h | 24 ++++++++++++------------ src/text_editor/window_command.cpp | 2 +- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/text_editor/text_editor.cpp b/src/text_editor/text_editor.cpp index 2fda4cc..d40762b 100644 --- a/src/text_editor/text_editor.cpp +++ b/src/text_editor/text_editor.cpp @@ -173,12 +173,6 @@ void OnCommand(Event event) { Scratch scratch; Array order = GetWindowZOrder(scratch); - Window *window = GetWindow(ActiveWindowID); - { - - } - - // Handle wheel scrolling if (event.xwheel || event.ywheel) { Vec2I mouse = MouseVec2I(); diff --git a/src/text_editor/window.cpp b/src/text_editor/window.cpp index c0c37a1..b77cf41 100644 --- a/src/text_editor/window.cpp +++ b/src/text_editor/window.cpp @@ -1,4 +1,4 @@ -inline WindowID AllocWindowID(Window *window) { +WindowID AllocWindowID(Window *window) { return {WindowIDs.id++, window}; } @@ -64,16 +64,16 @@ Window *FindWindow(BufferID buffer_id) { return NULL; } -inline Window *GetActiveWind() { +Window *GetActiveWind() { return GetWindow(ActiveWindowID); } -inline bool IsDocumentSelectionValid() { +bool IsDocumentSelectionValid() { if (DocumentSelected.id == -1) return false; return true; } -inline bool IsScrollbarSelectionValid() { +bool IsScrollbarSelectionValid() { if (ScrollbarSelected.id == -1) return false; return true; } diff --git a/src/text_editor/window.h b/src/text_editor/window.h index ae636d8..56aab63 100644 --- a/src/text_editor/window.h +++ b/src/text_editor/window.h @@ -25,18 +25,18 @@ struct Window { Int goto_list_pos; struct { - bool draw_scrollbar : 1; - bool draw_line_numbers : 1; - bool draw_darker : 1; - bool draw_line_highlight : 1; - bool visible : 1; - bool layout : 1; - bool close : 1; - bool sync_visibility_with_focus : 1; - bool lose_focus_on_escape : 1; - bool lose_visibility_on_escape : 1; - bool jump_history : 1; - bool eval_command : 1; + uint32_t draw_scrollbar : 1; + uint32_t draw_line_numbers : 1; + uint32_t draw_darker : 1; + uint32_t draw_line_highlight : 1; + uint32_t visible : 1; + uint32_t layout : 1; + uint32_t close : 1; + uint32_t sync_visibility_with_focus : 1; + uint32_t lose_focus_on_escape : 1; + uint32_t lose_visibility_on_escape : 1; + uint32_t jump_history : 1; + uint32_t eval_command : 1; uint32_t skip_checkpoint : 1; }; }; diff --git a/src/text_editor/window_command.cpp b/src/text_editor/window_command.cpp index 5109ba8..53cd732 100644 --- a/src/text_editor/window_command.cpp +++ b/src/text_editor/window_command.cpp @@ -160,7 +160,7 @@ void Command_ShowBufferList() { ActiveWindowID = command_bar.window->id; ResetBuffer(command_bar.buffer); For (Buffers) { - if (it->special || it->garbage) { + if (it->special || it->garbage || it->is_dir) { continue; } RawAppendf(command_bar.buffer, "\n%S", it->name);