SVN commit 620584 by ggarand: backport r620582. "fix RenderFileButton minmaxwidth calculation" M +2 -2 render_form.cpp --- branches/KDE/3.5/kdelibs/khtml/rendering/render_form.cpp #620583:620584 @@ -786,13 +786,13 @@ int size = element()->size(); int h = fm.lineSpacing(); - int w = fm.width( 'x' ) * (size > 0 ? size : 17); // "some" + int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" KLineEdit* edit = static_cast( m_widget )->lineEdit(); QSize s = edit->style().sizeFromContents(QStyle::CT_LineEdit, edit, QSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(QApplication::globalStrut()); - QSize bs = static_cast( m_widget )->sizeHint(); + QSize bs = static_cast( m_widget )->minimumSizeHint() - edit->minimumSizeHint(); setIntrinsicWidth( s.width() + bs.width() ); setIntrinsicHeight( kMax(s.height(), bs.height()) );