0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibGUI: TreeView tree column text painting adjustments

Browse source 
The text was painted with the assumption that no other column would be
present after the tree column, which won't always be true. Additionally,
some alignment and focus rect-related issues have been fixed.
This commit is contained in:
sin-ack 2021-08-07 23:31:29 +00:00 • committed by Andreas Kling
parent beda2161d4
commit ba768eb872
Notes: sideshowbarker 2024-07-18 07:17:17 +09:00
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibGUI/TreeView.cpp
View file

@ -309,10 +309,12 @@ void TreeView::paint_event(PaintEvent& event)
}
} else {
// It's the tree column!
int indent_width = indent_width_in_pixels() * indent_level;
Gfx::IntRect icon_rect = { rect.x(), rect.y(), icon_size(), icon_size() };
Gfx::IntRect text_rect = {
icon_rect.right() + 1 + icon_spacing(), rect.y(),
rect.width() - icon_size() - icon_spacing(), rect.height()
column_width - indent_width - icon_size() - 1 - icon_spacing() + horizontal_padding(), rect.height()
};
painter.fill_rect(text_rect, background_color);
@ -328,11 +330,15 @@ void TreeView::paint_event(PaintEvent& event)
}
}
}
draw_item_text(painter, index, is_selected_row, text_rect, index.data().to_string(), font_for_index(index), Gfx::TextAlignment::Center, Gfx::TextElision::None);
draw_item_text(painter, index, is_selected_row, text_rect, index.data().to_string(), font_for_index(index), Gfx::TextAlignment::CenterLeft, Gfx::TextElision::Right);
if (is_focused() && index == cursor_index()) {
painter.draw_rect(text_rect, palette().color(background_role()));
painter.draw_focus_rect(text_rect, palette().focus_outline());
auto focus_rect = text_rect;
focus_rect.set_left(focus_rect.left() - 2);
focus_rect.set_width(focus_rect.width() + 2);
painter.draw_rect(focus_rect, palette().color(background_role()));
painter.draw_focus_rect(focus_rect, palette().focus_outline());
}
auto index_at_indent = index;