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/QtCloseButton.cpp | |
| parent | 1e68d4dffd81e69e2ff740fdf249a696f05e0544 (diff) | |
| download | swift-contrib-c2833f8afa8db40cfebfe51ecf5bb42fd87d8dca.zip swift-contrib-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/QtCloseButton.cpp')
| -rw-r--r-- | Swift/QtUI/QtVCardWidget/QtCloseButton.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtCloseButton.cpp b/Swift/QtUI/QtVCardWidget/QtCloseButton.cpp index a6afe81..ebd62bc 100644 --- a/Swift/QtUI/QtVCardWidget/QtCloseButton.cpp +++ b/Swift/QtUI/QtVCardWidget/QtCloseButton.cpp @@ -14,25 +14,11 @@ namespace Swift { QtCloseButton::QtCloseButton(QWidget *parent) : QAbstractButton(parent) { - lightPixmap = QPixmap(12,12); - lightPixmap.fill(QColor(0,0,0,0)); - QStyleOption opt; - opt.init(this); - opt.state = QStyle::State(0); - opt.state |= QStyle::State_MouseOver; - QPainter lightPixmapPainter(&lightPixmap); - style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &lightPixmapPainter); - darkPixmap = QPixmap(12,12); - darkPixmap.fill(QColor(0,0,0,0)); - opt.init(this); - opt.state = QStyle::State(0); - QPainter darkPixmapPainter(&darkPixmap); - style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &darkPixmapPainter); } QSize QtCloseButton::sizeHint() const { - return QSize(width(), height()); + return QSize(style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, 0, 0), style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight, 0, 0)); } bool QtCloseButton::event(QEvent *e) { @@ -45,11 +31,15 @@ bool QtCloseButton::event(QEvent *e) { void QtCloseButton::paintEvent(QPaintEvent *) { QPainter painter(this); painter.setRenderHint(QPainter::HighQualityAntialiasing); - if (underMouse()) { - painter.drawPixmap(0, 0, height(), height(), darkPixmap); - } else { - painter.drawPixmap(0, 0, height(), height(), lightPixmap); + QStyleOption opt; + opt.init(this); + opt.state |= QStyle::State_AutoRaise; + if (underMouse() && !isDown()) { + opt.state |= QStyle::State_Raised; + } else if (isDown()) { + opt.state |= QStyle::State_Sunken; } + style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &painter, this); } } |