Fix multiline textedit not expanding on OS X
authorA. V. Lukyanov <dukzcry@users.noreply.github.com>
Thu, 11 Aug 2016 07:57:27 +0000 (10:57 +0300)
committerManuel Nickschas <sputnick@quassel-irc.org>
Wed, 14 Sep 2016 21:01:05 +0000 (23:01 +0200)
Fixes #1212. Resolves GH-240.

src/uisupport/multilineedit.cpp

index 0a7204a..90eadaa 100644 (file)
@@ -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();