From kde-commits  Wed Apr 30 23:04:54 2003
From: Dirk Mueller <mueller () kde ! org>
Date: Wed, 30 Apr 2003 23:04:54 +0000
To: kde-commits
Subject: kdelibs/khtml/rendering
X-MARC-Message: https://marc.info/?l=kde-commits&m=105174389931499

CVS commit by mueller: 

fix <textarea> vertical size calculation, to fix the marvin 404 handler
at http://www.gcfl.net/pub/FreeDOS/kernel


  M +2 -7      render_form.cpp   1.227
  M +1 -2      render_form.h   1.92


--- kdelibs/khtml/rendering/render_form.cpp  #1.226:1.227
@@ -1245,9 +1245,4 @@ bool TextAreaWidget::event( QEvent *e )
 }
 
-TextAreaWidget::~TextAreaWidget()
-{
-
-}
-
 // -------------------------------------------------------------------------
 
@@ -1288,5 +1283,5 @@ void RenderTextArea::calcMinMaxWidth()
     QSize size( QMAX(element()->cols(), 1)*m.width('x') + w->frameWidth() +
                 w->verticalScrollBar()->sizeHint().width(),
-                QMAX(element()->rows(), 1)*m.height() + w->frameWidth()*2 +
+                QMAX(element()->rows(), 1)*m.lineSpacing() + w->frameWidth()*4 +
                 (w->wordWrap() == QTextEdit::NoWrap ?
                  w->horizontalScrollBar()->sizeHint().height() : 0)

--- kdelibs/khtml/rendering/render_form.h  #1.91:1.92
@@ -403,5 +403,4 @@ class TextAreaWidget : public KTextEdit
 public:
     TextAreaWidget(int wrap, QWidget* parent);
-    ~TextAreaWidget();
 
 protected: