Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-09-18 21:47:37 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2013-10-09 15:56:49 (GMT) |
| commit | c2833f8afa8db40cfebfe51ecf5bb42fd87d8dca (patch) | |
| tree | b2a3bf68dfdd4c38879c98824947954bbe9f35d7 /Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp | |
| parent | 1e68d4dffd81e69e2ff740fdf249a696f05e0544 (diff) | |
| download | swift-c2833f8afa8db40cfebfe51ecf5bb42fd87d8dca.zip swift-c2833f8afa8db40cfebfe51ecf5bb42fd87d8dca.tar.bz2 | |
VCard UI fixes.
Fix QtRemovableItemDelegate and QtCloseButton rendering on Windows.
Fix organization's unit field to allow creation of new units.
Fix QtResizableLineEdit's sizeHint to be relative to font metrics.
Change-Id: I69809c9504fd4c9e00db3b3782f33dcdd941d0cd
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp b/Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp index efe04dc..4f1d3ab 100644 --- a/Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp +++ b/Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp @@ -11,9 +11,7 @@ namespace Swift { QtResizableLineEdit::QtResizableLineEdit(QWidget* parent) : QLineEdit(parent) { connect(this, SIGNAL(textChanged(QString)), SLOT(textChanged(QString))); - setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed); - int marginHeight = 6; - setMaximumHeight(fontMetrics().height() + marginHeight); + setMinimumWidth(30); } QtResizableLineEdit::~QtResizableLineEdit() { @@ -34,12 +32,16 @@ void QtResizableLineEdit::setEditable(const bool editable) { QSize QtResizableLineEdit::sizeHint() const { int horizontalMargin = 10; + int verticalMargin = 6; + QSize textDimensions; #if QT_VERSION >= 0x040700 - int w = fontMetrics().boundingRect(text().isEmpty() ? placeholderText() : text()).width() + horizontalMargin; + textDimensions = fontMetrics().boundingRect(text().isEmpty() ? placeholderText() : text()).size(); #else - int w = fontMetrics().boundingRect(text().isEmpty() ? QString(" ") : text()).width() + horizontalMargin; + textDimensions = fontMetrics().boundingRect(text().isEmpty() ? QString(" ") : text()).size(); #endif - return QSize(w, height()); + textDimensions.setWidth(textDimensions.width() + horizontalMargin); + textDimensions.setHeight(textDimensions.height() + verticalMargin); + return textDimensions; } void QtResizableLineEdit::textChanged(QString) { |