RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:47:44 +00:00
Code Issues Activity Actions

LibGUI: Ensure the "End" key sets the cursor to the visual line end

Browse source 
We are currently setting the physical mouse position to the visual
cursor content location. In a line containing only a multi-code point
emoji, this would set the cursor to column 1 rather than however many
code points there are.
This commit is contained in:
Timothy Flynn 2023-02-27 08:16:48 -05:00 • committed by Tim Flynn
parent a81e1a8c4f
commit 4edd8e8c5e
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibGUI/EditingEngine.cpp
View file

@ -271,12 +271,10 @@ void EditingEngine::move_to_line_beginning()
void EditingEngine::move_to_line_end() void EditingEngine::move_to_line_end()
{ {
if (m_editor->is_wrapping_enabled()) { if (m_editor->is_wrapping_enabled())
auto end_position = m_editor->cursor_content_rect().location().translated(m_editor->width(), 0); m_editor->set_cursor_to_end_of_visual_line();
m_editor->set_cursor(m_editor->text_position_at_content_position(end_position)); else
} else {
move_to_logical_line_end(); move_to_logical_line_end();
}
} }
void EditingEngine::move_to_logical_line_end() void EditingEngine::move_to_logical_line_end()

13
Userland/Libraries/LibGUI/TextEditor.cpp
View file

@ -1418,6 +1418,19 @@ void TextEditor::set_cursor_to_text_position(Gfx::IntPoint position)
set_cursor({ visual_position.line(), physical_column }); set_cursor({ visual_position.line(), physical_column });
} }
void TextEditor::set_cursor_to_end_of_visual_line()
{
for_each_visual_line(m_cursor.line(), [&](auto const&, auto& view, size_t start_of_visual_line, auto) {
if (m_cursor.column() < start_of_visual_line)
return IterationDecision::Continue;
if ((m_cursor.column() - start_of_visual_line) >= view.length())
return IterationDecision::Continue;
set_cursor(m_cursor.line(), start_of_visual_line + view.length());
return IterationDecision::Break;
});
}
void TextEditor::focusin_event(FocusEvent& event) void TextEditor::focusin_event(FocusEvent& event)
{ {
if (event.source() == FocusSource::Keyboard) if (event.source() == FocusSource::Keyboard)

1
Userland/Libraries/LibGUI/TextEditor.h
View file

@ -191,6 +191,7 @@ public:
void set_cursor(size_t line, size_t column); void set_cursor(size_t line, size_t column);
virtual void set_cursor(TextPosition const&); virtual void set_cursor(TextPosition const&);
void set_cursor_to_text_position(Gfx::IntPoint); void set_cursor_to_text_position(Gfx::IntPoint);
void set_cursor_to_end_of_visual_line();
Syntax::Highlighter* syntax_highlighter(); Syntax::Highlighter* syntax_highlighter();
Syntax::Highlighter const* syntax_highlighter() const; Syntax::Highlighter const* syntax_highlighter() const;