From acd5cba5d5f885aaf8c237136707106b1db5e258 Mon Sep 17 00:00:00 2001 From: Dennis van der Schagt Date: Sat, 1 Aug 2020 11:22:41 +0200 Subject: [PATCH] FIX(ui): Make chatwidget max height >= than its minimum height Fixes #3701 --- src/mumble/CustomElements.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp index 9cf967089..2375e86c6 100644 --- a/src/mumble/CustomElements.cpp +++ b/src/mumble/CustomElements.cpp @@ -136,7 +136,9 @@ QSize ChatbarTextEdit::minimumSizeHint() const { QSize ChatbarTextEdit::sizeHint() const { QSize sh = QTextEdit::sizeHint(); - sh.setHeight(static_cast(document()->documentLayout()->documentSize().height())); + const int minHeight = minimumSizeHint().height(); + const int documentHeight = document()->documentLayout()->documentSize().height(); + sh.setHeight(std::max(minHeight, documentHeight)); const_cast(this)->setMaximumHeight(sh.height()); return sh; }