From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 11 Apr 2009 08:29:33 +0000 (+0200)
Subject: Consider frameWidth() for setting the inputline height
X-Git-Tag: 0.5-rc1~228
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=b59ac9eaf6ab7580bca7d2cde3849229ddd11483;hp=758d3568fe1a9cd08bd6c62c87ac3ac2c48f2f4d

Consider frameWidth() for setting the inputline height

Turns out that the problem of being too large if we do this seems to be an
issue with a new documentMargin() property in Qt 4.5. Setting this to 0 and
adding the frameWidth() to the font height should fix #625.
---

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 03087fb6..ce0fa373 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
 }