FIX(client): Chatbar

Hartmnt · Sep 30, 2024 · 22aea7e · 22aea7e
1 parent 0a033af
commit 22aea7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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);