mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-21 10:19:03 +03:00
Terminal: Fixed bounding issue when clearing the selection on type
We were checking the columns of the whole selection instead of the the specfic line were modifying. Because of this, the selection remained if the selection's column on another line was less than the cursor.
This commit is contained in:
parent
eb9ccf1c0a
commit
0df7213670
Notes:
sideshowbarker
2024-07-19 12:31:42 +09:00
Author: https://github.com/RyanGrieb Commit: https://github.com/SerenityOS/serenity/commit/0df72136702 Pull-request: https://github.com/SerenityOS/serenity/pull/485
@ -177,7 +177,7 @@ void TerminalWidget::keydown_event(GKeyEvent& event)
|
||||
auto min_selection_row = min(m_selection_start.row(), m_selection_end.row());
|
||||
auto max_selection_row = max(m_selection_start.row(), m_selection_end.row());
|
||||
|
||||
if (future_cursor_column <= max(m_selection_start.column(), m_selection_end.column()) && m_terminal.cursor_row() >= min_selection_row && m_terminal.cursor_row() <= max_selection_row) {
|
||||
if (future_cursor_column <= last_selection_column_on_row(m_terminal.cursor_row()) && m_terminal.cursor_row() >= min_selection_row && m_terminal.cursor_row() <= max_selection_row) {
|
||||
m_selection_end = {};
|
||||
update();
|
||||
}
|
||||
@ -464,8 +464,8 @@ String TerminalWidget::selected_text() const
|
||||
auto end = normalized_selection_end();
|
||||
|
||||
for (int row = start.row(); row <= end.row(); ++row) {
|
||||
int first_column = row == start.row() ? start.column() : 0;
|
||||
int last_column = row == end.row() ? end.column() : m_terminal.columns() - 1;
|
||||
int first_column = first_selection_column_on_row(row);
|
||||
int last_column = last_selection_column_on_row(row);
|
||||
for (int column = first_column; column <= last_column; ++column) {
|
||||
auto& line = m_terminal.line(row);
|
||||
if (line.attributes[column].is_untouched()) {
|
||||
@ -482,6 +482,16 @@ String TerminalWidget::selected_text() const
|
||||
return builder.to_string();
|
||||
}
|
||||
|
||||
int TerminalWidget::first_selection_column_on_row(int row) const
|
||||
{
|
||||
return row == normalized_selection_start().row() ? normalized_selection_start().column() : 0;
|
||||
}
|
||||
|
||||
int TerminalWidget::last_selection_column_on_row(int row) const
|
||||
{
|
||||
return row == normalized_selection_end().row() ? normalized_selection_end().column() : m_terminal.columns() - 1;
|
||||
}
|
||||
|
||||
void TerminalWidget::terminal_history_changed()
|
||||
{
|
||||
bool was_max = m_scrollbar->value() == m_scrollbar->max();
|
||||
|
@ -66,6 +66,8 @@ private:
|
||||
void invalidate_cursor();
|
||||
|
||||
Size compute_base_size() const;
|
||||
int first_selection_column_on_row(int row) const;
|
||||
int last_selection_column_on_row(int row) const;
|
||||
|
||||
VT::Terminal m_terminal;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user