RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 14:07:42 +00:00
Code Issues Activity Actions

LibGUI+Applications: Rename Model::is_valid to is_within_range

Browse source 
The previous name did not describe what the function checked, and was
easy to confuse with ModelIndex::is_valid.
This commit is contained in:
sin-ack 2021-06-27 12:08:16 +00:00 • committed by Andreas Kling
parent 9899addb1d
commit 16ac3bbfd7
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/SystemMonitor/DevicesModel.cpp
View file

@ -54,7 +54,7 @@ String DevicesModel::column_name(int column) const
GUI::Variant DevicesModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const GUI::Variant DevicesModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{ {
VERIFY(is_valid(index)); VERIFY(is_within_range(index));
if (role == GUI::ModelRole::TextAlignment) { if (role == GUI::ModelRole::TextAlignment) {
switch (index.column()) { switch (index.column()) {

2
Userland/Applications/SystemMonitor/ProcessModel.cpp
View file

@ -130,7 +130,7 @@ static String pretty_byte_size(size_t size)
GUI::Variant ProcessModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const GUI::Variant ProcessModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
{ {
VERIFY(is_valid(index)); VERIFY(is_within_range(index));
if (role == GUI::ModelRole::TextAlignment) { if (role == GUI::ModelRole::TextAlignment) {
switch (index.column()) { switch (index.column()) {

4
Userland/DevTools/HackStudio/Locator.cpp
View file

@ -115,7 +115,7 @@ Locator::Locator(Core::Object* parent)
else else
new_index = m_suggestion_view->model()->index(0); new_index = m_suggestion_view->model()->index(0);
if (m_suggestion_view->model()->is_valid(new_index)) { if (m_suggestion_view->model()->is_within_range(new_index)) {
m_suggestion_view->selection().set(new_index); m_suggestion_view->selection().set(new_index);
m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical); m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical);
} }
@ -127,7 +127,7 @@ Locator::Locator(Core::Object* parent)
else else
new_index = m_suggestion_view->model()->index(0); new_index = m_suggestion_view->model()->index(0);
if (m_suggestion_view->model()->is_valid(new_index)) { if (m_suggestion_view->model()->is_within_range(new_index)) {
m_suggestion_view->selection().set(new_index); m_suggestion_view->selection().set(new_index);
m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical); m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical);
} }

12
Userland/Libraries/LibGUI/AbstractView.cpp
View file

@ -61,17 +61,17 @@ void AbstractView::model_did_update(unsigned int flags)
} else { } else {
// FIXME: These may no longer point to whatever they did before, // FIXME: These may no longer point to whatever they did before,
// but let's be optimistic until we can be sure about it. // but let's be optimistic until we can be sure about it.
if (!model()->is_valid(m_edit_index)) { if (!model()->is_within_range(m_edit_index)) {
stop_editing(); stop_editing();
m_edit_index = {}; m_edit_index = {};
} }
if (!model()->is_valid(m_hovered_index)) if (!model()->is_within_range(m_hovered_index))
m_hovered_index = {}; m_hovered_index = {};
if (!model()->is_valid(m_cursor_index)) if (!model()->is_within_range(m_cursor_index))
m_cursor_index = {}; m_cursor_index = {};
if (!model()->is_valid(m_drop_candidate_index)) if (!model()->is_within_range(m_drop_candidate_index))
m_drop_candidate_index = {}; m_drop_candidate_index = {};
selection().remove_matching([this](auto& index) { return !model()->is_valid(index); }); selection().remove_matching([this](auto& index) { return !model()->is_within_range(index); });
} }
m_selection_start_index = {}; m_selection_start_index = {};
} }
@ -442,7 +442,7 @@ void AbstractView::set_cursor(ModelIndex index, SelectionUpdate selection_update
if (selection_mode() == SelectionMode::SingleSelection && (selection_update == SelectionUpdate::Ctrl || selection_update == SelectionUpdate::Shift)) if (selection_mode() == SelectionMode::SingleSelection && (selection_update == SelectionUpdate::Ctrl || selection_update == SelectionUpdate::Shift))
selection_update = SelectionUpdate::Set; selection_update = SelectionUpdate::Set;
if (model()->is_valid(index)) { if (model()->is_within_range(index)) {
if (selection_update == SelectionUpdate::Set) { if (selection_update == SelectionUpdate::Set) {
set_selection(index); set_selection(index);
set_selection_start_index(index); set_selection_start_index(index);

6
Userland/Libraries/LibGUI/AutocompleteProvider.cpp
View file

@ -141,7 +141,7 @@ void AutocompleteBox::next_suggestion()
else else
new_index = m_suggestion_view->model()->index(0); new_index = m_suggestion_view->model()->index(0);
if (m_suggestion_view->model()->is_valid(new_index)) { if (m_suggestion_view->model()->is_within_range(new_index)) {
m_suggestion_view->selection().set(new_index); m_suggestion_view->selection().set(new_index);
m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical); m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical);
} }
@ -155,7 +155,7 @@ void AutocompleteBox::previous_suggestion()
else else
new_index = m_suggestion_view->model()->index(0); new_index = m_suggestion_view->model()->index(0);
if (m_suggestion_view->model()->is_valid(new_index)) { if (m_suggestion_view->model()->is_within_range(new_index)) {
m_suggestion_view->selection().set(new_index); m_suggestion_view->selection().set(new_index);
m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical); m_suggestion_view->scroll_into_view(new_index, Orientation::Vertical);
} }
@ -170,7 +170,7 @@ void AutocompleteBox::apply_suggestion()
return; return;
auto selected_index = m_suggestion_view->selection().first(); auto selected_index = m_suggestion_view->selection().first();
if (!selected_index.is_valid() || !m_suggestion_view->model()->is_valid(selected_index)) if (!selected_index.is_valid() || !m_suggestion_view->model()->is_within_range(selected_index))
return; return;
auto suggestion_index = m_suggestion_view->model()->index(selected_index.row(), AutocompleteSuggestionModel::Column::Name); auto suggestion_index = m_suggestion_view->model()->index(selected_index.row(), AutocompleteSuggestionModel::Column::Name);

4
Userland/Libraries/LibGUI/ColumnsView.cpp
View file

@ -295,8 +295,8 @@ void ColumnsView::move_cursor(CursorMovement movement, SelectionUpdate selection
break; break;
case CursorMovement::Right: case CursorMovement::Right:
new_index = model.index(0, m_model_column, cursor_index()); new_index = model.index(0, m_model_column, cursor_index());
if (model.is_valid(new_index)) { if (model.is_within_range(new_index)) {
if (model.is_valid(cursor_index())) if (model.is_within_range(cursor_index()))
push_column(cursor_index()); push_column(cursor_index());
update(); update();
} }

2
Userland/Libraries/LibGUI/Model.h
View file

@ -69,7 +69,7 @@ public:
virtual bool is_column_sortable([[maybe_unused]] int column_index) const { return true; } virtual bool is_column_sortable([[maybe_unused]] int column_index) const { return true; }
virtual void sort([[maybe_unused]] int column, SortOrder) { } virtual void sort([[maybe_unused]] int column, SortOrder) { }
bool is_valid(const ModelIndex& index) const bool is_within_range(ModelIndex const& index) const
{ {
auto parent_index = this->parent_index(index); auto parent_index = this->parent_index(index);
return index.row() >= 0 && index.row() < row_count(parent_index) && index.column() >= 0 && index.column() < column_count(parent_index); return index.row() >= 0 && index.row() < row_count(parent_index) && index.column() >= 0 && index.column() < column_count(parent_index);

4
Userland/Libraries/LibGUI/TableView.cpp
View file

@ -220,7 +220,7 @@ void TableView::move_cursor(CursorMovement movement, SelectionUpdate selection_u
int items_per_page = visible_content_rect().height() / row_height(); int items_per_page = visible_content_rect().height() / row_height();
auto old_index = selection().first(); auto old_index = selection().first();
auto new_index = model.index(max(0, old_index.row() - items_per_page), old_index.column()); auto new_index = model.index(max(0, old_index.row() - items_per_page), old_index.column());
if (model.is_valid(new_index)) if (model.is_within_range(new_index))
set_cursor(new_index, selection_update); set_cursor(new_index, selection_update);
break; break;
} }
@ -228,7 +228,7 @@ void TableView::move_cursor(CursorMovement movement, SelectionUpdate selection_u
int items_per_page = visible_content_rect().height() / row_height(); int items_per_page = visible_content_rect().height() / row_height();
auto old_index = selection().first(); auto old_index = selection().first();
auto new_index = model.index(min(model.row_count() - 1, old_index.row() + items_per_page), old_index.column()); auto new_index = model.index(min(model.row_count() - 1, old_index.row() + items_per_page), old_index.column());
if (model.is_valid(new_index)) if (model.is_within_range(new_index))
set_cursor(new_index, selection_update); set_cursor(new_index, selection_update);
break; break;
} }