From kde-commits Mon Feb 28 23:41:27 2011 From: David Edmundson Date: Mon, 28 Feb 2011 23:41:27 +0000 To: kde-commits Subject: =?utf-8?q?=5Btelepathy-chat-handler=5D_lib=3A_Add_a_maxmium_heig?= Message-Id: <20110228234127.A46E8A60CD () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129893652528034 Git commit d2403e562fec719b292e27a8f54a003ff4e750b7 by David Edmundson. Committed on 07/02/2011 at 17:28. Pushed by davidedmundson into branch 'master'. Add a maxmium height on the text input box. M +0 -2 lib/chattextedit.cpp M +6 -0 lib/chatwidget.ui http://commits.kde.org/telepathy-chat-handler/d2403e562fec719b292e27a8f54a003ff4e750b7 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 @@ 0 + + + 16777215 + 100 + + QFrame::StyledPanel