[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=d2403e5

The following commit has been merged in the master branch:
commit d2403e562fec719b292e27a8f54a003ff4e750b7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Feb 7 16:28:29 2011 +0000

    Add a maxmium height on the text input box.
---
 lib/chattextedit.cpp | 2 --
 lib/chatwidget.ui    | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/chattextedit.cpp b/lib/chattextedit.cpp
index e4d08d1..0746cbe 100644
--- a/lib/chattextedit.cpp
+++ b/lib/chattextedit.cpp
@@ -75,8 +75,6 @@ QSize ChatTextEdit::sizeHint() const
     QSize sh = QTextEdit::sizeHint();
     sh.setHeight(int(document()->size().height()));
     sh += QSize(0, (QFrame::lineWidth() * 2) + 1);
-    ((QTextEdit*)this)->setMaximumHeight(sh.height());
-
     return sh;
 }
 
diff --git a/lib/chatwidget.ui b/lib/chatwidget.ui
index e85d5c2..8c74787 100644
--- a/lib/chatwidget.ui
+++ b/lib/chatwidget.ui
@@ -120,6 +120,12 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>100</height>
+        </size>
+       </property>
        <property name="frameShape">
         <enum>QFrame::StyledPanel</enum>
        </property>

-- 
ktp-text-ui packaging