Consider frameWidth() for setting the inputline height

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

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index f9c8a65..ce0fa37 100644 (file)
--- 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
 }
 
@@ -241,4 +244,9 @@ 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]);
+#ifdef HAVE_KDE
+  QTextCursor cursor = textCursor();
+  cursor.movePosition(QTextCursor::End);
+  setTextCursor(cursor);
+#endif
 }