diff options
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index cf294e3c34..bd8dd783ff 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -712,8 +712,11 @@ QSize QLineEdit::minimumSizeHint() const ensurePolished(); QFontMetrics fm = fontMetrics(); int h = fm.height() + qMax(2*d->verticalMargin, fm.leading()) + + d->topTextMargin + d->bottomTextMargin + d->topmargin + d->bottommargin; - int w = fm.maxWidth() + d->leftmargin + d->rightmargin; + int w = fm.maxWidth() + + d->effectiveLeftTextMargin() + d->effectiveRightTextMargin() + + d->leftmargin + d->rightmargin; QStyleOptionFrame opt; initStyleOption(&opt); return (style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(w, h). diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 78fa0b4928..bf4d1f2ebd 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3384,10 +3384,20 @@ void tst_QLineEdit::textMargin() testWidget.setCursorPosition(6); QSize sizeHint = testWidget.sizeHint(); + QSize minSizeHint = testWidget.minimumSizeHint(); testWidget.setTextMargins(left, top, right, bottom); + sizeHint.setWidth(sizeHint.width() + left + right); sizeHint.setHeight(sizeHint.height() + top +bottom); QCOMPARE(testWidget.sizeHint(), sizeHint); + + if (minSizeHint.width() > -1) { + minSizeHint.setWidth(minSizeHint.width() + left + right); + minSizeHint.setHeight(minSizeHint.height() + top + bottom); + QCOMPARE(testWidget.minimumSizeHint(), minSizeHint); + } + + testWidget.setFrame(false); centerOnScreen(&tlw); tlw.show(); |