RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:57:35 +00:00
Code Issues Activity Actions

LibGUI: Teach IconView to use AbstractView::move_cursor()

Browse source 
This makes it possible to manipulate the cursor programmatically via
the AbstractView interface.
This commit is contained in:
Andreas Kling 2020-09-01 14:43:16 +02:00
parent 22265f1445
commit 72443bd1ab
2 changed files with 61 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

136
Libraries/LibGUI/IconView.cpp
View file

@ -600,112 +600,94 @@ void IconView::keydown_event(KeyEvent& event)
if (!m_visual_row_count || !m_visual_column_count) if (!m_visual_row_count || !m_visual_column_count)
return; return;
auto& model = *this->model(); SelectionUpdate selection_update = SelectionUpdate::Set;
if (event.key() == KeyCode::Key_Return) { if (event.key() == KeyCode::Key_Return) {
activate_selected(); activate_selected();
return; return;
} }
if (event.key() == KeyCode::Key_Home) { if (event.key() == KeyCode::Key_Home) {
auto new_index = model.index(0, 0); move_cursor(CursorMovement::Home, selection_update);
if (model.is_valid(new_index)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_End) { if (event.key() == KeyCode::Key_End) {
auto new_index = model.index(model.row_count() - 1, 0); move_cursor(CursorMovement::End, selection_update);
if (model.is_valid(new_index)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_Up) { if (event.key() == KeyCode::Key_Up) {
ModelIndex new_index; move_cursor(CursorMovement::Up, selection_update);
if (!selection().is_empty()) {
auto old_index = selection().first();
new_index = model.index(old_index.row() - m_visual_column_count, old_index.column());
} else {
new_index = model.index(0, 0);
}
if (model.is_valid(new_index)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_Down) { if (event.key() == KeyCode::Key_Down) {
ModelIndex new_index; move_cursor(CursorMovement::Down, selection_update);
if (!selection().is_empty()) {
auto old_index = selection().first();
new_index = model.index(old_index.row() + m_visual_column_count, old_index.column());
} else {
new_index = model.index(0, 0);
}
if (model.is_valid(new_index)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_Left) { if (event.key() == KeyCode::Key_Left) {
ModelIndex new_index; move_cursor(CursorMovement::Left, selection_update);
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)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_Right) { if (event.key() == KeyCode::Key_Right) {
ModelIndex new_index; move_cursor(CursorMovement::Right, selection_update);
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)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_PageUp) { if (event.key() == KeyCode::Key_PageUp) {
int items_per_page = (visible_content_rect().height() / effective_item_size().height()) * m_visual_column_count; move_cursor(CursorMovement::PageUp, selection_update);
auto old_index = selection().first();
auto new_index = model.index(max(0, old_index.row() - items_per_page), old_index.column());
if (model.is_valid(new_index)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_PageDown) { if (event.key() == KeyCode::Key_PageDown) {
int items_per_page = (visible_content_rect().height() / effective_item_size().height()) * m_visual_column_count; move_cursor(CursorMovement::PageDown, selection_update);
auto old_index = selection().first();
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)) {
set_selection(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
return Widget::keydown_event(event); return Widget::keydown_event(event);
} }
void IconView::move_cursor(CursorMovement movement, SelectionUpdate selection_update)
{
if (!model())
return;
auto& model = *this->model();
if (!cursor_index().is_valid()) {
set_cursor(model.index(0, 0), SelectionUpdate::Set);
return;
}
ModelIndex new_index;
switch (movement) {
case CursorMovement::Right:
new_index = model.index(cursor_index().row() + 1, cursor_index().column());
break;
case CursorMovement::Left:
new_index = model.index(cursor_index().row() - 1, cursor_index().column());
break;
case CursorMovement::Up:
new_index = model.index(cursor_index().row() - m_visual_column_count, cursor_index().column());
break;
case CursorMovement::Down:
new_index = model.index(cursor_index().row() + m_visual_column_count, cursor_index().column());
break;
case CursorMovement::PageUp: {
int items_per_page = (visible_content_rect().height() / effective_item_size().height()) * m_visual_column_count;
new_index = model.index(max(0, cursor_index().row() - items_per_page), cursor_index().column());
break;
}
case CursorMovement::PageDown: {
int items_per_page = (visible_content_rect().height() / effective_item_size().height()) * m_visual_column_count;
new_index = model.index(min(model.row_count() - 1, cursor_index().row() + items_per_page), cursor_index().column());
break;
}
case CursorMovement::Home:
new_index = model.index(0, 0);
break;
case CursorMovement::End:
new_index = model.index(model.row_count() - 1, 0);
break;
default:
break;
}
if (new_index.is_valid())
set_cursor(new_index, selection_update);
}
} }

2
Libraries/LibGUI/IconView.h
View file

@ -64,6 +64,8 @@ private:
virtual void keydown_event(KeyEvent&) override; virtual void keydown_event(KeyEvent&) override;
virtual void drag_move_event(DragEvent&) override; virtual void drag_move_event(DragEvent&) override;
virtual void move_cursor(CursorMovement, SelectionUpdate) override;
struct ItemData { struct ItemData {
Gfx::IntRect text_rect; Gfx::IntRect text_rect;
Gfx::IntRect icon_rect; Gfx::IntRect icon_rect;