X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=6cd4fcbf1de29ccdfadac62bfe3a9356063fc85b;hp=593af037b9d3a29b81985ed47e360e46ad90f947;hb=dbcac581af9130fb4d2839ada4141d3dcf459859;hpb=c3300ca8b3ff0fd9ce8deb4fd0590514f1101b73

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 593af037..6cd4fcbf 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -35,6 +35,9 @@ InputLine::InputLine(QWidget *parent)
 {
 #ifdef HAVE_KDE
 //This is done to make the KTextEdit look like a lineedit
+#if QT_VERSION >= 0x040500
+  document()->setDocumentMargin(0);
+#endif
   setMaximumHeight(document()->size().toSize().height());
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -54,7 +57,7 @@ InputLine::~InputLine() {
 void InputLine::setCustomFont(const QFont &font) {
   setFont(font);
 #ifdef HAVE_KDE
-  setMaximumHeight(document()->size().toSize().height());
+  setMaximumHeight(document()->size().toSize().height() + 2*frameWidth());
 #endif
 }
 
@@ -130,15 +133,9 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 #ifdef HAVE_KDE
 //Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
-    event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
-    break;
-
   case Qt::Key_Enter:
     event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
+    emit returnPressed();
     break;
 
 #endif
@@ -175,9 +172,11 @@ bool InputLine::addToHistory(const QString &text, bool temporary) {
 }
 
 void InputLine::on_returnPressed() {
-  addToHistory(text());
-  emit sendText(text());
-  resetLine();
+  if(!text().isEmpty()) {
+    addToHistory(text());
+    emit sendText(text());
+    resetLine();
+  }
 }
 
 void InputLine::on_textChanged(QString newText) {
@@ -244,5 +243,13 @@ void InputLine::resetLine() {
 
 void InputLine::showHistoryEntry() {
   // if the user changed the history, display the changed line
-  tempHistory.contains(idx) ? setText(tempHistory[idx]) : setText(history[idx]);
+  QString text = tempHistory.contains(idx) ? tempHistory[idx] : history[idx];
+#ifdef HAVE_KDE
+  setPlainText(text);
+  QTextCursor cursor = textCursor();
+  cursor.movePosition(QTextCursor::End);
+  setTextCursor(cursor);
+#else
+  setText(text);
+#endif
 }