From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Fri, 21 Aug 2009 21:54:57 +0000 (+0200)
Subject: Slightly improve behavior on resize
X-Git-Tag: 0.5-rc1~54
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=57c08c48e867edf38a9ce0547719cbd1b839952d

Slightly improve behavior on resize
---

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 934c7462..3a6876b0 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -65,7 +65,7 @@ MultiLineEdit::~MultiLineEdit() {
 
 void MultiLineEdit::setCustomFont(const QFont &font) {
   setFont(font);
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMode(Mode mode) {
@@ -80,7 +80,7 @@ void MultiLineEdit::setMinHeight(int lines) {
     return;
 
   _minHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setMaxHeight(int lines) {
@@ -88,7 +88,7 @@ void MultiLineEdit::setMaxHeight(int lines) {
     return;
 
   _maxHeight = lines;
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::setScrollBarsEnabled(bool enable) {
@@ -114,11 +114,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 +143,7 @@ void MultiLineEdit::computeSizeHint() {
 QSize MultiLineEdit::sizeHint() const {
   if(!_sizeHint.isValid()) {
     MultiLineEdit *that = const_cast<MultiLineEdit *>(this);
-    that->computeSizeHint();
+    that->updateSizeHint();
   }
   return _sizeHint;
 }
@@ -315,7 +316,7 @@ void MultiLineEdit::on_textChanged() {
     _lastDocumentHeight = document()->size().height();
     on_documentHeightChanged(_lastDocumentHeight);
   }
-  computeSizeHint();
+  updateSizeHint();
 }
 
 void MultiLineEdit::on_documentHeightChanged(qreal) {
diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h
index dbe9580a..0a527b9e 100644
--- a/src/uisupport/multilineedit.h
+++ b/src/uisupport/multilineedit.h
@@ -105,7 +105,7 @@ private:
   void reset();
   void showHistoryEntry();
   void updateScrollBars();
-  void computeSizeHint();
+  void updateSizeHint();
 };
 
 #endif