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

LibGUI: Improve GTreeView column auto-sizing

Browse source 
Rerun the column auto-sizing algorithm when opening/closing nodes.
Also use the column name as the minimum column width for the tree
column as well.
This commit is contained in:
Andreas Kling 2019-12-13 23:51:16 +01:00
parent 5cd4fb4db2
commit 561718d88b
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibGUI/GTreeView.cpp
View file

@ -35,7 +35,7 @@ GTreeView::~GTreeView()
GModelIndex GTreeView::index_at_event_position(const Point& a_position, bool& is_toggle) const GModelIndex GTreeView::index_at_event_position(const Point& a_position, bool& is_toggle) const
{ {
auto position = a_position.translated(0, -header_height()).translated(-frame_thickness(), -frame_thickness()); auto position = a_position.translated(0, -header_height()).translated(horizontal_scrollbar().value() - frame_thickness(), vertical_scrollbar().value() - frame_thickness());
is_toggle = false; is_toggle = false;
if (!model()) if (!model())
return {}; return {};
@ -77,9 +77,9 @@ void GTreeView::doubleclick_event(GMouseEvent& event)
void GTreeView::toggle_index(const GModelIndex& index) void GTreeView::toggle_index(const GModelIndex& index)
{ {
ASSERT(model()->row_count(index)); ASSERT(model()->row_count(index));
dbg() << "toggling index " << index << " with child count: " << model()->row_count(index);
auto& metadata = ensure_metadata_for_index(index); auto& metadata = ensure_metadata_for_index(index);
metadata.open = !metadata.open; metadata.open = !metadata.open;
update_column_sizes();
update_content_size(); update_content_size();
update(); update();
} }
@ -372,6 +372,7 @@ void GTreeView::keydown_event(GKeyEvent& event)
auto& metadata = ensure_metadata_for_index(cursor_index); auto& metadata = ensure_metadata_for_index(cursor_index);
if (metadata.open) { if (metadata.open) {
metadata.open = false; metadata.open = false;
update_column_sizes();
update_content_size(); update_content_size();
update(); update();
} }
@ -383,6 +384,7 @@ void GTreeView::keydown_event(GKeyEvent& event)
auto& metadata = ensure_metadata_for_index(cursor_index); auto& metadata = ensure_metadata_for_index(cursor_index);
if (!metadata.open) { if (!metadata.open) {
metadata.open = true; metadata.open = true;
update_column_sizes();
update_content_size(); update_content_size();
update(); update();
} }
@ -426,6 +428,7 @@ void GTreeView::update_column_sizes()
int column_count = model.column_count(); int column_count = model.column_count();
int row_count = model.row_count(); int row_count = model.row_count();
int tree_column = model.tree_column(); int tree_column = model.tree_column();
int tree_column_x_offset = 0;
for (int column = 0; column < column_count; ++column) { for (int column = 0; column < column_count; ++column) {
if (column == tree_column) if (column == tree_column)
@ -448,14 +451,17 @@ void GTreeView::update_column_sizes()
auto& column_data = this->column_data(column); auto& column_data = this->column_data(column);
column_data.width = max(column_data.width, column_width); column_data.width = max(column_data.width, column_width);
column_data.has_initialized_width = true; column_data.has_initialized_width = true;
if (column < tree_column)
tree_column_x_offset += column_width;
} }
int tree_column_width = 0; int tree_column_header_width = header_font().width(model.column_name(tree_column));
int tree_column_width = tree_column_header_width;
traverse_in_paint_order([&](const GModelIndex&, const Rect& rect, const Rect&, int) { traverse_in_paint_order([&](const GModelIndex&, const Rect& rect, const Rect&, int) {
tree_column_width = max(rect.width(), tree_column_width); tree_column_width = max(rect.right() - tree_column_x_offset, tree_column_width);
return IterationDecision::Continue; return IterationDecision::Continue;
}); });
dbg() << "Found tree column width: " << tree_column_width;
auto& column_data = this->column_data(tree_column); auto& column_data = this->column_data(tree_column);
column_data.width = max(column_data.width, tree_column_width); column_data.width = max(column_data.width, tree_column_width);