From 3fe5dc35f28c4fb0f4295eebb207b794245af428 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 13 May 2020 21:24:27 +0200 Subject: [PATCH] LibGUI: Add AbstractTableView::move_selection(int steps) This allows embedders to step the selection up/down and also simplifies AbstractTableView by sharing code between Key_Up and Key_Down. :^) --- Libraries/LibGUI/AbstractTableView.cpp | 45 ++++++++++++-------------- Libraries/LibGUI/AbstractTableView.h | 3 ++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Libraries/LibGUI/AbstractTableView.cpp b/Libraries/LibGUI/AbstractTableView.cpp index ecfb85c266b..e480ba59835 100644 --- a/Libraries/LibGUI/AbstractTableView.cpp +++ b/Libraries/LibGUI/AbstractTableView.cpp @@ -428,6 +428,25 @@ int AbstractTableView::item_count() const return model()->row_count(); } +void AbstractTableView::move_selection(int steps) +{ + if (!model()) + return; + auto& model = *this->model(); + ModelIndex new_index; + if (!selection().is_empty()) { + auto old_index = selection().first(); + new_index = model.index(old_index.row() + steps, old_index.column()); + } else { + new_index = model.index(0, 0); + } + if (model.is_valid(new_index)) { + selection().set(new_index); + scroll_into_view(new_index, Orientation::Vertical); + update(); + } +} + void AbstractTableView::keydown_event(KeyEvent& event) { if (!model()) @@ -438,33 +457,11 @@ void AbstractTableView::keydown_event(KeyEvent& event) return; } if (event.key() == KeyCode::Key_Up) { - ModelIndex new_index; - if (!selection().is_empty()) { - auto old_index = selection().first(); - new_index = model.index(old_index.row() - 1, old_index.column()); - } else { - new_index = model.index(0, 0); - } - if (model.is_valid(new_index)) { - selection().set(new_index); - scroll_into_view(new_index, Orientation::Vertical); - update(); - } + move_selection(-1); return; } if (event.key() == KeyCode::Key_Down) { - ModelIndex new_index; - if (!selection().is_empty()) { - auto old_index = selection().first(); - new_index = model.index(old_index.row() + 1, old_index.column()); - } else { - new_index = model.index(0, 0); - } - if (model.is_valid(new_index)) { - selection().set(new_index); - scroll_into_view(new_index, Orientation::Vertical); - update(); - } + move_selection(1); return; } if (event.key() == KeyCode::Key_PageUp) { diff --git a/Libraries/LibGUI/AbstractTableView.h b/Libraries/LibGUI/AbstractTableView.h index 75555406a35..1eb1dc753a8 100644 --- a/Libraries/LibGUI/AbstractTableView.h +++ b/Libraries/LibGUI/AbstractTableView.h @@ -71,6 +71,9 @@ public: virtual ModelIndex index_at_event_position(const Gfx::Point&) const override; virtual void select_all() override; + + void move_selection(int steps); + protected: virtual ~AbstractTableView() override; AbstractTableView();