[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=5a699d0

The following commit has been merged in the master branch:
commit 5a699d0bb9845a1234d5f4c27c26a8a7c82d6aa4
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Sun Apr 21 02:28:23 2013 +0200

    Set minimumSizeHint in a nicer way
---
 lib/chat-text-edit.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/chat-text-edit.cpp b/lib/chat-text-edit.cpp
index 517e3e1..4f640a2 100644
--- a/lib/chat-text-edit.cpp
+++ b/lib/chat-text-edit.cpp
@@ -85,8 +85,9 @@ QSize ChatTextEdit::minimumSizeHint() const
 QSize ChatTextEdit::sizeHint() const
 {
     QSize sh = KTextEdit::sizeHint();
-    sh.setHeight(int (document()->size().height()));
-    sh += QSize(0, (QFrame::lineWidth() * 2) + 1);
+    sh.setHeight((int)(document()->size().height()) +
+                 contentsMargins().top() +
+                 contentsMargins().bottom());
     return sh;
 }
 

-- 
ktp-text-ui packaging