[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdelibs/khtml/rendering
From: Germain Garand <germain () ebooksfrance ! com>
Date: 2007-01-06 17:04:40
Message-ID: 1168103080.330924.24543.nullmailer () svn ! kde ! org
[Download RAW message or body]
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<KURLRequester*>( 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<KURLRequester*>( m_widget )->sizeHint();
+ QSize bs = static_cast<KURLRequester*>( m_widget )->minimumSizeHint() - edit->minimumSizeHint();
setIntrinsicWidth( s.width() + bs.width() );
setIntrinsicHeight( kMax(s.height(), bs.height()) );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic