Send text on shift+return in SingleLine mode

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

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 699d4ec..9029f02 100644 (file)
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -231,8 +231,11 @@ void MultiLineEdit::keyPressEvent(QKeyEvent *event) {
 # endif
 #endif
 
-    if(_mode == SingleLine)
+    if(_mode == SingleLine) {
+      event->accept();
+      on_returnPressed();
       return;
+    }
 #ifdef HAVE_KDE
     KTextEdit::keyPressEvent(event);
 #else
@@ -310,6 +313,8 @@ void MultiLineEdit::on_returnPressed(const QString & text) {
     }
     reset();
     tempHistory.clear();
+  } else {
+    emit noTextEntered();
   }
 }
 
@@ -358,6 +363,7 @@ void MultiLineEdit::on_textChanged() {
     on_documentHeightChanged(_lastDocumentHeight);
   }
   updateSizeHint();
+  ensureCursorVisible();
 }
 
 void MultiLineEdit::on_documentHeightChanged(qreal) {