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

LibGUI: Add some horizontal padding to multi-line IconView item titles

Browse source 
And don't use the padding from the item's text rect as extra space for
glyphs when breaking lines.
This commit is contained in:
Andreas Kling 2020-10-23 09:43:55 +02:00
parent 5b50174e5d
commit 06a29e8aa5
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibGUI/IconView.cpp
View file

@ -465,11 +465,14 @@ void IconView::paint_event(PaintEvent& event)
} }
} }
// NOTE: This counteracts the inflate(6, ...) in get_text_rects().
auto available_width = item_data.text_rect.width() - 3;
auto font = font_for_index(item_data.index); auto font = font_for_index(item_data.index);
auto text_width = font->width(item_text.to_string()); auto text_width = font->width(item_text.to_string());
auto text = item_text.to_string(); auto text = item_text.to_string();
if ((item_data.selected || m_hovered_index == item_data.index) && item_data.index != m_edit_index && text_width > item_data.text_rect.width()) { if ((item_data.selected || m_hovered_index == item_data.index) && item_data.index != m_edit_index && text_width > available_width) {
// Item text would not fit in the item text rect, let's break it up into lines.. // Item text would not fit in the item text rect, let's break it up into lines..
// FIXME: Maybe break this out into some kind of GUI::TextLayout class? // FIXME: Maybe break this out into some kind of GUI::TextLayout class?
@ -482,7 +485,7 @@ void IconView::paint_event(PaintEvent& event)
for (; it != utf8_view.end(); ++it) { for (; it != utf8_view.end(); ++it) {
auto codepoint = *it; auto codepoint = *it;
auto glyph_width = font->glyph_width(codepoint); auto glyph_width = font->glyph_width(codepoint);
if (lines.size() < 1 && (current_line_width + glyph_width + font->glyph_spacing()) > item_data.text_rect.width()) { if (lines.size() < 1 && (current_line_width + glyph_width + font->glyph_spacing()) > available_width) {
lines.append(text.substring_view(current_line_start, utf8_view.byte_offset_of(it) - current_line_start)); lines.append(text.substring_view(current_line_start, utf8_view.byte_offset_of(it) - current_line_start));
current_line_start = utf8_view.byte_offset_of(it); current_line_start = utf8_view.byte_offset_of(it);
current_line_width = glyph_width; current_line_width = glyph_width;
@ -496,10 +499,11 @@ void IconView::paint_event(PaintEvent& event)
for (size_t line_index = 0; line_index < lines.size(); ++line_index) { for (size_t line_index = 0; line_index < lines.size(); ++line_index) {
Gfx::IntRect line_rect; Gfx::IntRect line_rect;
line_rect.set_width(min(item_data.text_rect.width(), font->width(lines[line_index]))); line_rect.set_width(min(available_width, font->width(lines[line_index])));
line_rect.set_height(item_data.text_rect.height()); line_rect.set_height(item_data.text_rect.height());
line_rect.center_horizontally_within(item_data.text_rect); line_rect.center_horizontally_within(item_data.text_rect);
line_rect.set_y(item_data.text_rect.y() + line_index * item_data.text_rect.height()); line_rect.set_y(item_data.text_rect.y() + line_index * item_data.text_rect.height());
line_rect.inflate(6, 0);
painter.fill_rect(line_rect, background_color); painter.fill_rect(line_rect, background_color);
draw_item_text(painter, item_data.index, item_data.selected, line_rect, lines[line_index], font, Gfx::TextAlignment::Center, Gfx::TextElision::Right); draw_item_text(painter, item_data.index, item_data.selected, line_rect, lines[line_index], font, Gfx::TextAlignment::Center, Gfx::TextElision::Right);
} }