diff --git a/src/text_editor/commands.cpp b/src/text_editor/commands.cpp index 3306e40..881bb20 100644 --- a/src/text_editor/commands.cpp +++ b/src/text_editor/commands.cpp @@ -257,20 +257,21 @@ bool GlobalCommand(Event event) { ProfileFunction(); bool run_window_command = true; { - Vec2I mouse = MouseVec2I(); - Window *window = GetActiveWindow(); - bool mouse_in_document = CheckCollisionPointRec(mouse, window->document_rect); - bool mouse_in_total = CheckCollisionPointRec(mouse, window->total_rect); - bool mouse_in_scrollbar = CheckCollisionPointRec(mouse, window->scrollbar_rect); - window->mouse_in_scrollbar = mouse_in_scrollbar; + Vec2I mouse = MouseVec2I(); + Window *window = GetActiveWindow(); + bool mouse_in_document = CheckCollisionPointRec(mouse, window->document_rect); + bool mouse_in_total = CheckCollisionPointRec(mouse, window->total_rect); + bool mouse_in_line_numbers = CheckCollisionPointRec(mouse, window->line_numbers_rect); + bool mouse_in_scrollbar = CheckCollisionPointRec(mouse, window->scrollbar_rect); + window->mouse_in_scrollbar = mouse_in_scrollbar; static SDL_Cursor *SDL_MouseCursor; if (SDL_MouseCursor) SDL_DestroyCursor(SDL_MouseCursor); - if (window->mouse_selecting || mouse_in_total) { + if (window->mouse_selecting || mouse_in_document) { SDL_MouseCursor = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_TEXT); SDL_SetCursor(SDL_MouseCursor); - } else if (mouse_in_scrollbar || window->mouse_selecting_scrollbar) { + } else if (mouse_in_scrollbar || window->mouse_selecting_scrollbar || mouse_in_line_numbers) { SDL_MouseCursor = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_DEFAULT); SDL_SetCursor(SDL_MouseCursor); } else { diff --git a/src/text_editor/text_editor.cpp b/src/text_editor/text_editor.cpp index 2668984..4d02632 100644 --- a/src/text_editor/text_editor.cpp +++ b/src/text_editor/text_editor.cpp @@ -319,7 +319,6 @@ int main() // This is here to render changes in title bar size without a frame of delay LayoutWindows(); - BeginFrameRender(); Scratch scratch; Array order = GetWindowZOrder(scratch); diff --git a/src/text_editor/todo.txt b/src/text_editor/todo.txt index 4c37c40..fec7f2e 100644 --- a/src/text_editor/todo.txt +++ b/src/text_editor/todo.txt @@ -1,6 +1,4 @@ - bugs: - - scrolling in fullscreen is busted because no space outside of window - - scrolling when clicking on scroller is busted - page up and down should also scroll and leave you in exactly same scroll - I think the way sublime text and we display line highlights is confusing with multiple cursors (line highlight can be confused with selection) - don't trim lines with cursor or selection on it