mirror of
https://github.com/RGBCube/serenity
synced 2025-05-21 15:05:07 +00:00
GTextEditor: Allow moving the selected line(s) up/down in bulk
You can now press Ctrl+Shift+Up/Down in a GTextEditor and the currently selected line(s) will all move together one step up/down. If there is no selection, we move the line with the cursor on it. :^)
This commit is contained in:
parent
c16b1a515e
commit
fa77a57257
2 changed files with 69 additions and 0 deletions
|
@ -506,6 +506,64 @@ void GTextEditor::redo()
|
||||||
m_undo_stack_index--;
|
m_undo_stack_index--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GTextEditor::get_selection_line_boundaries(int& first_line, int& last_line)
|
||||||
|
{
|
||||||
|
auto selection = normalized_selection();
|
||||||
|
if (!selection.is_valid()) {
|
||||||
|
first_line = m_cursor.line();
|
||||||
|
last_line = m_cursor.line();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
first_line = selection.start().line();
|
||||||
|
last_line = selection.end().line();
|
||||||
|
if (first_line != last_line && selection.end().column() == 0)
|
||||||
|
last_line -= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GTextEditor::move_selected_lines_up()
|
||||||
|
{
|
||||||
|
int first_line;
|
||||||
|
int last_line;
|
||||||
|
get_selection_line_boundaries(first_line, last_line);
|
||||||
|
|
||||||
|
if (first_line == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
auto& lines = document().lines();
|
||||||
|
lines.insert(last_line, lines.take(first_line - 1));
|
||||||
|
m_cursor = { first_line - 1, 0 };
|
||||||
|
|
||||||
|
if (has_selection()) {
|
||||||
|
m_selection.set_start({ first_line - 1, 0 });
|
||||||
|
m_selection.set_end({ last_line - 1, line(last_line - 1).length() });
|
||||||
|
}
|
||||||
|
|
||||||
|
did_change();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
|
void GTextEditor::move_selected_lines_down()
|
||||||
|
{
|
||||||
|
int first_line;
|
||||||
|
int last_line;
|
||||||
|
get_selection_line_boundaries(first_line, last_line);
|
||||||
|
|
||||||
|
auto& lines = document().lines();
|
||||||
|
if (last_line >= (lines.size() - 1))
|
||||||
|
return;
|
||||||
|
|
||||||
|
lines.insert(first_line, lines.take(last_line + 1));
|
||||||
|
m_cursor = { first_line + 1, 0 };
|
||||||
|
|
||||||
|
if (has_selection()) {
|
||||||
|
m_selection.set_start({ first_line + 1, 0 });
|
||||||
|
m_selection.set_end({ last_line + 1, line(last_line + 1).length() });
|
||||||
|
}
|
||||||
|
|
||||||
|
did_change();
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
void GTextEditor::keydown_event(GKeyEvent& event)
|
void GTextEditor::keydown_event(GKeyEvent& event)
|
||||||
{
|
{
|
||||||
if (is_single_line() && event.key() == KeyCode::Key_Tab)
|
if (is_single_line() && event.key() == KeyCode::Key_Tab)
|
||||||
|
@ -524,6 +582,10 @@ void GTextEditor::keydown_event(GKeyEvent& event)
|
||||||
}
|
}
|
||||||
if (event.key() == KeyCode::Key_Up) {
|
if (event.key() == KeyCode::Key_Up) {
|
||||||
if (m_cursor.line() > 0) {
|
if (m_cursor.line() > 0) {
|
||||||
|
if (event.ctrl() && event.shift()) {
|
||||||
|
move_selected_lines_up();
|
||||||
|
return;
|
||||||
|
}
|
||||||
int new_line = m_cursor.line() - 1;
|
int new_line = m_cursor.line() - 1;
|
||||||
int new_column = min(m_cursor.column(), lines()[new_line].length());
|
int new_column = min(m_cursor.column(), lines()[new_line].length());
|
||||||
toggle_selection_if_needed_for_event(event);
|
toggle_selection_if_needed_for_event(event);
|
||||||
|
@ -537,6 +599,10 @@ void GTextEditor::keydown_event(GKeyEvent& event)
|
||||||
}
|
}
|
||||||
if (event.key() == KeyCode::Key_Down) {
|
if (event.key() == KeyCode::Key_Down) {
|
||||||
if (m_cursor.line() < (lines().size() - 1)) {
|
if (m_cursor.line() < (lines().size() - 1)) {
|
||||||
|
if (event.ctrl() && event.shift()) {
|
||||||
|
move_selected_lines_down();
|
||||||
|
return;
|
||||||
|
}
|
||||||
int new_line = m_cursor.line() + 1;
|
int new_line = m_cursor.line() + 1;
|
||||||
int new_column = min(m_cursor.column(), lines()[new_line].length());
|
int new_column = min(m_cursor.column(), lines()[new_line].length());
|
||||||
toggle_selection_if_needed_for_event(event);
|
toggle_selection_if_needed_for_event(event);
|
||||||
|
|
|
@ -161,6 +161,9 @@ private:
|
||||||
void recompute_all_visual_lines();
|
void recompute_all_visual_lines();
|
||||||
void ensure_cursor_is_valid();
|
void ensure_cursor_is_valid();
|
||||||
void flush_pending_change_notification_if_needed();
|
void flush_pending_change_notification_if_needed();
|
||||||
|
void get_selection_line_boundaries(int& first_line, int& last_line);
|
||||||
|
void move_selected_lines_up();
|
||||||
|
void move_selected_lines_down();
|
||||||
|
|
||||||
class UndoCommand {
|
class UndoCommand {
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue