From 22aea7e6798ffbfaf7e153c19705eb5944827cc2 Mon Sep 17 00:00:00 2001
From: Hartmnt <hartmunt@protonmail.com>
Date: Mon, 30 Sep 2024 08:49:10 +0000
Subject: [PATCH] FIX(client): Chatbar

---
 src/mumble/CustomElements.cpp | 10 ++++++++--
 src/mumble/MainWindow.cpp     |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/mumble/CustomElements.cpp b/src/mumble/CustomElements.cpp
index b43742fcfc1..c3c941c8f03 100644
--- a/src/mumble/CustomElements.cpp
+++ b/src/mumble/CustomElements.cpp
@@ -102,12 +102,18 @@ void ChatbarTextEdit::dropEvent(QDropEvent *evt) {
 	}
 }
 
+#include <QDebug>
+
 ChatbarTextEdit::ChatbarTextEdit(QWidget *p) : QTextEdit(p), iHistoryIndex(-1) {
 	setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-	setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 	setMinimumHeight(0);
-	connect(this, SIGNAL(textChanged()), SLOT(doResize()));
+	connect(this, &ChatbarTextEdit::textChanged, this, &ChatbarTextEdit::doResize);
+
+	const int chatBarTextHeight = QFontMetrics(font()).height();
+	qDebug() << "chat bar text height " << chatBarTextHeight;
+	setMaximumHeight(chatBarTextHeight * 5);
 
 	bDefaultVisible = true;
 	setDefaultText(tr("<center>Type chat message here</center>"));
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index b1ba0ec361f..eb0b29f60d0 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -501,6 +501,7 @@ void MainWindow::setupGui() {
 	qteChat->setDefaultText(tr("<center>Not connected</center>"), true);
 	qteChat->setEnabled(false);
 
+
 	QWidget *dummyTitlebar = new QWidget(qdwMinimalViewNote);
 	qdwMinimalViewNote->setTitleBarWidget(dummyTitlebar);