From: A. V. Lukyanov <dukzcry@users.noreply.github.com>
Date: Thu, 11 Aug 2016 07:57:27 +0000 (+0300)
Subject: Fix multiline textedit not expanding on OS X
X-Git-Tag: travis-deploy-test~375
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=03d1b64ddb8638465eafb4dca2dfd592739603cf

Fix multiline textedit not expanding on OS X

Fixes #1212. Resolves GH-240.
---

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 0a7204a8..90eadaa7 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -183,7 +183,11 @@ void MultiLineEdit::updateSizeHint()
     opt.lineWidth = lineWidth();
     opt.midLineWidth = midLineWidth();
     opt.state |= QStyle::State_Sunken;
-    QSize s = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(100, h).expandedTo(QApplication::globalStrut()), this);
+    QWidget *widget = this;
+#ifdef Q_OS_MAC
+    widget = 0;
+#endif
+    QSize s = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(100, h).expandedTo(QApplication::globalStrut()), widget);
     if (s != _sizeHint) {
         _sizeHint = s;
         updateGeometry();