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/QtVCardOrganizationField.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/QtVCardOrganizationField.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp index e399885..9ecc8e0 100644 --- a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp +++ b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp @@ -39,7 +39,7 @@ void QtVCardOrganizationField::setupContentWidgets() { unitsTreeWidget = new QTreeWidget(this); unitsTreeWidget->setColumnCount(2); unitsTreeWidget->header()->setStretchLastSection(false); - int closeIconWidth = unitsTreeWidget->fontMetrics().height(); + int closeIconWidth = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, 0); unitsTreeWidget->header()->resizeSection(1, closeIconWidth); #if QT_VERSION >= 0x050000 @@ -76,6 +76,10 @@ void QtVCardOrganizationField::setOrganization(const VCard::Organization& organi item->setFlags(item->flags() | Qt::ItemIsEditable); unitsTreeWidget->addTopLevelItem(item); } + + QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << ""); + item->setFlags(item->flags() | Qt::ItemIsEditable); + unitsTreeWidget->addTopLevelItem(item); } VCard::Organization QtVCardOrganizationField::getOrganization() const { @@ -88,10 +92,6 @@ VCard::Organization QtVCardOrganizationField::getOrganization() const { } } - QTreeWidgetItem* item = new QTreeWidgetItem(QStringList("") << ""); - item->setFlags(item->flags() | Qt::ItemIsEditable); - unitsTreeWidget->addTopLevelItem(item); - return organization; } |