RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 13:37:43 +00:00
Code Issues Activity Actions

LibGUI: Create TextAttributes for unspanned text once, not repeatedly

Browse source 
Also, stop unnecessarily creating a RefPtr for the unspanned font - just
use `font()`, which returns a reference.
This commit is contained in:
Sam Atkins 2023-02-21 15:10:37 +00:00 • committed by Andreas Kling
parent e8b7bdbd57
commit b5e1babc26
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibGUI/TextEditor.cpp
View file

@ -420,6 +420,13 @@ void TextEditor::paint_event(PaintEvent& event)
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
painter.fill_rect(event.rect(), widget_background_color); painter.fill_rect(event.rect(), widget_background_color);
Gfx::TextAttributes unspanned_text_attributes;
if (is_displayonly() && is_focused()) {
unspanned_text_attributes.color = palette().color(is_enabled() ? Gfx::ColorRole::SelectionText : Gfx::ColorRole::DisabledText);
} else {
unspanned_text_attributes.color = palette().color(is_enabled() ? foreground_role() : Gfx::ColorRole::DisabledText);
}
// NOTE: This lambda and TextEditor::text_width_for_font() are used to substitute all glyphs with m_substitution_code_point if necessary. // NOTE: This lambda and TextEditor::text_width_for_font() are used to substitute all glyphs with m_substitution_code_point if necessary.
// Painter::draw_text() and Gfx::Font::width() should not be called directly, but using this lambda and TextEditor::text_width_for_font(). // Painter::draw_text() and Gfx::Font::width() should not be called directly, but using this lambda and TextEditor::text_width_for_font().
auto draw_text = [&](Gfx::IntRect const& rect, auto const& raw_text, Gfx::Font const& font, Gfx::TextAlignment alignment, Gfx::TextAttributes attributes, bool substitute = true) { auto draw_text = [&](Gfx::IntRect const& rect, auto const& raw_text, Gfx::Font const& font, Gfx::TextAlignment alignment, Gfx::TextAttributes attributes, bool substitute = true) {
@ -558,29 +565,21 @@ void TextEditor::paint_event(PaintEvent& event)
draw_text(line_rect, placeholder(), font(), m_text_alignment, { palette().color(Gfx::ColorRole::PlaceholderText) }, false); draw_text(line_rect, placeholder(), font(), m_text_alignment, { palette().color(Gfx::ColorRole::PlaceholderText) }, false);
} else if (!document().has_spans()) { } else if (!document().has_spans()) {
// Fast-path for plain text // Fast-path for plain text
auto color = palette().color(is_enabled() ? foreground_role() : Gfx::ColorRole::DisabledText); draw_text(visual_line_rect, visual_line_text, font(), m_text_alignment, unspanned_text_attributes);
if (is_displayonly() && is_focused())
color = palette().color(is_enabled() ? Gfx::ColorRole::SelectionText : Gfx::ColorRole::DisabledText);
draw_text(visual_line_rect, visual_line_text, font(), m_text_alignment, { color });
} else { } else {
auto unspanned_color = palette().color(is_enabled() ? foreground_role() : Gfx::ColorRole::DisabledText);
if (is_displayonly() && is_focused())
unspanned_color = palette().color(is_enabled() ? Gfx::ColorRole::SelectionText : Gfx::ColorRole::DisabledText);
RefPtr<Gfx::Font const> unspanned_font = this->font();
size_t next_column = 0; size_t next_column = 0;
Gfx::IntRect span_rect = { visual_line_rect.location(), { 0, line_height() } }; Gfx::IntRect span_rect = { visual_line_rect.location(), { 0, line_height() } };
auto draw_text_helper = [&](size_t start, size_t end, RefPtr<Gfx::Font const>& font, Gfx::TextAttributes text_attributes) { auto draw_text_helper = [&](size_t start, size_t end, Gfx::Font const& font, Gfx::TextAttributes text_attributes) {
size_t length = end - start; size_t length = end - start;
if (length == 0) if (length == 0)
return; return;
auto text = visual_line_text.substring_view(start, length); auto text = visual_line_text.substring_view(start, length);
span_rect.set_width(font->width(text) + font->glyph_spacing()); span_rect.set_width(font.width(text) + font.glyph_spacing());
if (text_attributes.background_color.has_value()) { if (text_attributes.background_color.has_value()) {
painter.fill_rect(span_rect, text_attributes.background_color.value()); painter.fill_rect(span_rect, text_attributes.background_color.value());
} }
draw_text(span_rect, text, *font, m_text_alignment, text_attributes); draw_text(span_rect, text, font, m_text_alignment, text_attributes);
span_rect.translate_by(span_rect.width(), 0); span_rect.translate_by(span_rect.width(), 0);
}; };
while (span_index < document().spans().size()) { while (span_index < document().spans().size()) {
@ -612,10 +611,10 @@ void TextEditor::paint_event(PaintEvent& event)
if (span_start != next_column) { if (span_start != next_column) {
// draw unspanned text between spans // draw unspanned text between spans
draw_text_helper(next_column, span_start, unspanned_font, { unspanned_color }); draw_text_helper(next_column, span_start, font(), unspanned_text_attributes);
} }
auto font = span.attributes.bold ? unspanned_font->bold_variant() : unspanned_font; auto& span_font = span.attributes.bold ? font().bold_variant() : font();
draw_text_helper(span_start, span_end, font, span.attributes); draw_text_helper(span_start, span_end, span_font, span.attributes);
next_column = span_end; next_column = span_end;
if (!span_consumed) { if (!span_consumed) {
// continue with same span on next line // continue with same span on next line
@ -626,7 +625,7 @@ void TextEditor::paint_event(PaintEvent& event)
} }
// draw unspanned text after last span // draw unspanned text after last span
if (next_column < visual_line_text.length()) { if (next_column < visual_line_text.length()) {
draw_text_helper(next_column, visual_line_text.length(), unspanned_font, { unspanned_color }); draw_text_helper(next_column, visual_line_text.length(), font(), unspanned_text_attributes);
} }
} }