mirror of
https://github.com/RGBCube/serenity
synced 2025-05-31 08:08:12 +00:00
LibGUI: Skip over grapheme clusters on left/right arrow key presses
Currently, if you use the left/right arrow keys to move over a multi- code point glyph, we will move through that glyph one code point at a time. This means you can "pause" your movement in the middle of a glyph and delete a subsection of a grapheme cluster. This now moves the cursor across the entire cluster. Visually, we will need to separately track physical and virtual cursor positions. That is, when you move across a multi-code point glyph, the visual cursor should only move one position at a time, while a physical cursor stores the "real" position in terms of number of code points. This also converts a couple of ints to auto - these are actually size_t, and are being passed to functions that expect size_t, so let's not cast them to ints.
This commit is contained in:
parent
d0697d350d
commit
8a94c7a7f7
1 changed files with 8 additions and 6 deletions
|
@ -167,26 +167,28 @@ bool EditingEngine::on_key(KeyEvent const& event)
|
|||
void EditingEngine::move_one_left()
|
||||
{
|
||||
if (m_editor->cursor().column() > 0) {
|
||||
int new_column = m_editor->cursor().column() - 1;
|
||||
auto new_column = m_editor->document().get_previous_grapheme_cluster_boundary(m_editor->cursor());
|
||||
m_editor->set_cursor(m_editor->cursor().line(), new_column);
|
||||
} else if (m_editor->cursor().line() > 0) {
|
||||
int new_line = m_editor->cursor().line() - 1;
|
||||
int new_column = m_editor->lines()[new_line].length();
|
||||
auto new_line = m_editor->cursor().line() - 1;
|
||||
auto new_column = m_editor->lines()[new_line].length();
|
||||
m_editor->set_cursor(new_line, new_column);
|
||||
}
|
||||
}
|
||||
|
||||
void EditingEngine::move_one_right()
|
||||
{
|
||||
int new_line = m_editor->cursor().line();
|
||||
int new_column = m_editor->cursor().column();
|
||||
auto new_line = m_editor->cursor().line();
|
||||
auto new_column = m_editor->cursor().column();
|
||||
|
||||
if (m_editor->cursor().column() < m_editor->current_line().length()) {
|
||||
new_line = m_editor->cursor().line();
|
||||
new_column = m_editor->cursor().column() + 1;
|
||||
new_column = m_editor->document().get_next_grapheme_cluster_boundary(m_editor->cursor());
|
||||
} else if (m_editor->cursor().line() != m_editor->line_count() - 1) {
|
||||
new_line = m_editor->cursor().line() + 1;
|
||||
new_column = 0;
|
||||
}
|
||||
|
||||
m_editor->set_cursor(new_line, new_column);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue