1 files changed, 7 insertions, 11 deletions
diff --git a/Swift/QtUI/QtTextEdit.cpp b/Swift/QtUI/QtTextEdit.cpp
index 79a9474..a0188d9 100644
--- a/Swift/QtUI/QtTextEdit.cpp
+++ b/Swift/QtUI/QtTextEdit.cpp
@@ -8,16 +8,16 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <QApplication>
-#include <QFontMetrics>
 #include <QKeyEvent>
 #include <QMenu>
 #include <QTime>
+#include <QTextDocument>
 
 #include <Swiften/Base/foreach.h>
 
 #include <Swift/Controllers/SettingConstants.h>
 
 #include <SwifTools/SpellChecker.h>
@@ -33,12 +33,15 @@ QtTextEdit::QtTextEdit(SettingsProvider* settings, QWidget* parent) : QTextEdit(
 	connect(this, SIGNAL(textChanged()), this, SLOT(handleTextChanged()));
 	settings_ = settings;
 #ifdef HAVE_SPELLCHECKER
 	setUpSpellChecker();
 #endif
 	handleTextChanged();
+	QTextOption textOption = document()->defaultTextOption();
+	textOption.setWrapMode(QTextOption::WordWrap);
+	document()->setDefaultTextOption(textOption);
 }
 
 QtTextEdit::~QtTextEdit() {
 	delete checker_;
 }
 
@@ -110,22 +113,15 @@ PositionPair QtTextEdit::getWordFromCursor(int cursorPosition) {
 		}
 	}
 	return boost::make_tuple(-1,-1);
 }
 
 QSize QtTextEdit::sizeHint() const {
-	QFontMetrics inputMetrics(currentFont());
-	QRect horizontalBounds = contentsRect().adjusted(0,0,0,9999);
-	QRect boundingRect = inputMetrics.boundingRect(horizontalBounds, Qt::TextWordWrap, toPlainText() + "A");
-	int left, top, right, bottom;
-	getContentsMargins(&left, &top, &right, &bottom);
-	int height = boundingRect.height() + top + bottom + inputMetrics.height();
-	return QSize(width(), height);
-	//int numberOfLines = 1;
-	//int lineHeight = inputMetrics.lineSpacing();
-	//return QSize(QTextEdit::sizeHint().width(), lineHeight * numberOfLines);
+	QSize hint = document()->size().toSize();
+	QMargins margins = contentsMargins();
+	return hint + QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
 }
 
 void QtTextEdit::contextMenuEvent(QContextMenuEvent* event) {
 	QMenu* menu = createStandardContextMenu();
 	QTextCursor cursor = cursorForPosition(event->pos());
 #ifdef HAVE_SPELLCHECKER