RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:48:12 +00:00
Code Issues Activity Actions

LibGUI: GTableView should scroll items into view when keyboard navigating.

Browse source
This commit is contained in:
Andreas Kling 2019-03-01 14:29:34 +01:00
parent ac8fb5da4c
commit 574a399347
2 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

50
LibGUI/GTableView.cpp
View file

@ -179,14 +179,54 @@ void GTableView::keydown_event(GKeyEvent& event)
return; return;
} }
if (event.key() == KeyCode::Key_Up) { if (event.key() == KeyCode::Key_Up) {
model.set_selected_index({ model.selected_index().row() - 1, model.selected_index().column() }); GModelIndex new_index(model.selected_index().row() - 1, model.selected_index().column());
update(); if (model.is_valid(new_index)) {
model.set_selected_index(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
if (event.key() == KeyCode::Key_Down) { if (event.key() == KeyCode::Key_Down) {
model.set_selected_index({ model.selected_index().row() + 1, model.selected_index().column() }); GModelIndex new_index(model.selected_index().row() + 1, model.selected_index().column());
update(); if (model.is_valid(new_index)) {
model.set_selected_index(new_index);
scroll_into_view(new_index, Orientation::Vertical);
update();
}
return; return;
} }
return GTableView::keydown_event(event); return GWidget::keydown_event(event);
} }
Rect GTableView::visible_content_rect() const
{
return {
m_horizontal_scrollbar->value(),
m_vertical_scrollbar->value(),
width() - m_vertical_scrollbar->width(),
height() - header_height() - m_horizontal_scrollbar->height()
};
}
void GTableView::scroll_into_view(const GModelIndex& index, Orientation orientation)
{
auto visible_content_rect = this->visible_content_rect();
auto rect = row_rect(index.row()).translated(0, -header_height());
if (visible_content_rect.contains(rect))
return;
if (orientation == Orientation::Vertical) {
if (rect.top() < visible_content_rect.top())
m_vertical_scrollbar->set_value(rect.top());
else if (rect.bottom() > visible_content_rect.bottom())
m_vertical_scrollbar->set_value(rect.bottom() - visible_content_rect.height());
} else {
if (rect.left() < visible_content_rect.left())
m_horizontal_scrollbar->set_value(rect.left());
else if (rect.right() > visible_content_rect.right())
m_horizontal_scrollbar->set_value(rect.right() - visible_content_rect.width());
}
}

3
LibGUI/GTableView.h
View file

@ -26,6 +26,9 @@ public:
virtual bool accepts_focus() const override { return true; } virtual bool accepts_focus() const override { return true; }
Rect visible_content_rect() const;
void scroll_into_view(const GModelIndex&, Orientation);
private: private:
virtual void model_notification(const GModelNotification&); virtual void model_notification(const GModelNotification&);