Don't wrap the input line (really this time!)

[quassel.git] / src / uisupport / multilineedit.cpp

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 934c746..96fd43f 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -54,7 +54,8 @@ MultiLineEdit::MultiLineEdit(QWidget *parent)
   enableFindReplace(false);
 #endif
 
-  setMode(SingleLine); setLineWrapMode(WidgetWidth);
+  setMode(SingleLine);
+  setWordWrapEnabled(false);
   reset();
 
   connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
@@ -65,7 +66,7 @@ MultiLineEdit::~MultiLineEdit() {
 
 void MultiLineEdit::setCustomFont(const QFont &font) {
   setFont(font);
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMode(Mode mode) {
@@ -80,7 +81,7 @@ void MultiLineEdit::setMinHeight(int lines) {
     return;
 
   _minHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMaxHeight(int lines) {
@@ -88,7 +89,7 @@ void MultiLineEdit::setMaxHeight(int lines) {
     return;
 
   _maxHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setScrollBarsEnabled(bool enable) {
@@ -114,11 +115,12 @@ void MultiLineEdit::updateScrollBars() {
 }
 
 void MultiLineEdit::resizeEvent(QResizeEvent *event) {
-  updateScrollBars();
   QTextEdit::resizeEvent(event);
+  updateSizeHint();
+  updateScrollBars();
 }
 
-void MultiLineEdit::computeSizeHint() {
+void MultiLineEdit::updateSizeHint() {
   QFontMetrics fm(font());
   int minPixelHeight = fm.lineSpacing() * _minHeight;
   int maxPixelHeight = fm.lineSpacing() * _maxHeight;
@@ -142,7 +144,7 @@ void MultiLineEdit::computeSizeHint() {
 QSize MultiLineEdit::sizeHint() const {
   if(!_sizeHint.isValid()) {
     MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
-    that->computeSizeHint();
+    that->updateSizeHint();
   }
   return _sizeHint;
 }
@@ -161,6 +163,7 @@ void MultiLineEdit::setSpellCheckEnabled(bool enable) {
 
 void MultiLineEdit::setWordWrapEnabled(bool enable) {
   setLineWrapMode(enable? WidgetWidth : NoWrap);
+  updateSizeHint();
 }
 
 void MultiLineEdit::historyMoveBack() {
@@ -315,7 +318,7 @@ void MultiLineEdit::on_textChanged() {
     _lastDocumentHeight = document()->size().height();
     on_documentHeightChanged(_lastDocumentHeight);
   }
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::on_documentHeightChanged(qreal) {