From 901b80f988c6f9863b3806c4e7ea2bdfc3a86941 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Thu, 22 Sep 2022 19:00:01 -0400 Subject: [PATCH] LibGUI: Update calculated_min_size() for TextEditor Defer to AbstractScrollableWidget when TextEditor is multi-line. Otherwise, as "vertical_content_size" was unused, simply return margins for now. --- Userland/Libraries/LibGUI/TextEditor.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Userland/Libraries/LibGUI/TextEditor.cpp b/Userland/Libraries/LibGUI/TextEditor.cpp index c45f0acdc6..dfdedb3d08 100644 --- a/Userland/Libraries/LibGUI/TextEditor.cpp +++ b/Userland/Libraries/LibGUI/TextEditor.cpp @@ -754,13 +754,10 @@ void TextEditor::paint_event(PaintEvent& event) Optional TextEditor::calculated_min_size() const { - auto margins = content_margins(); - int horizontal = margins.left() + margins.right(), - vertical = margins.top() + margins.bottom(); - int vertical_content_size = font().glyph_height() + 4; - if (!is_multi_line() && m_icon) - vertical_content_size = max(vertical_content_size, icon_size() + 2); - return UISize(horizontal, vertical); + if (is_multi_line()) + return AbstractScrollableWidget::calculated_min_size(); + auto m = content_margins(); + return UISize { m.left() + m.right(), m.top() + m.bottom() }; } void TextEditor::select_all()