feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils::DetailsWidget: Implement icon functionality for non checkbox case

Browse Source 
While Qt Checkbox has a convenient api for setting a icon and a text, for
labels we need to do it the hard way.

Change-Id: I9e653b76b08357083a58b558afee5a2c74f1625b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-10-02 13:53:47 +02:00
parent 6355f605e3
commit 856b4b72e5
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/utils/detailswidget.cpp
View File

@@ -37,6 +37,7 @@
#include <QPainter>
#include <QScrollArea>
#include <QApplication>
#include <QStyle>
/*!
\class Utils::DetailsWidget
@@ -73,6 +74,7 @@ public:
QWidget *q;
DetailsButton *m_detailsButton;
QGridLayout *m_grid;
QLabel *m_summaryLabelIcon;
QLabel *m_summaryLabel;
QCheckBox *m_summaryCheckBox;
QLabel *m_additionalSummaryLabel;
@@ -91,6 +93,7 @@ DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget *parent) :
q(parent),
m_detailsButton(new DetailsButton),
m_grid(new QGridLayout),
m_summaryLabelIcon(new QLabel(parent)),
m_summaryLabel(new QLabel(parent)),
m_summaryCheckBox(new QCheckBox(parent)),
m_additionalSummaryLabel(new QLabel(parent)),
@@ -104,6 +107,11 @@ DetailsWidgetPrivate::DetailsWidgetPrivate(QWidget *parent) :
summaryLayout->setContentsMargins(MARGIN, MARGIN, MARGIN, MARGIN);
summaryLayout->setSpacing(0);
m_summaryLabelIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_summaryLabelIcon->setContentsMargins(0, 0, 0, 0);
m_summaryLabelIcon->setFixedWidth(0);
summaryLayout->addWidget(m_summaryLabelIcon);
m_summaryLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
m_summaryLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
m_summaryLabel->setContentsMargins(0, 0, 0, 0);
@@ -164,6 +172,7 @@ void DetailsWidgetPrivate::updateControls()
m_widget->setVisible(m_state == DetailsWidget::Expanded || m_state == DetailsWidget::NoSummary);
m_detailsButton->setChecked(m_state == DetailsWidget::Expanded && m_widget);
m_detailsButton->setVisible(m_state == DetailsWidget::Expanded || m_state == DetailsWidget::Collapsed);
m_summaryLabelIcon->setVisible(m_state != DetailsWidget::NoSummary && !m_useCheckBox);
m_summaryLabel->setVisible(m_state != DetailsWidget::NoSummary && !m_useCheckBox);
m_summaryCheckBox->setVisible(m_state != DetailsWidget::NoSummary && m_useCheckBox);
@@ -242,6 +251,9 @@ void DetailsWidget::setSummaryFontBold(bool b)
void DetailsWidget::setIcon(const QIcon &icon)
{
int iconSize = style()->pixelMetric(QStyle::PM_ButtonIconSize, 0, this);
d->m_summaryLabelIcon->setFixedWidth(icon.isNull() ? 0 : iconSize);
d->m_summaryLabelIcon->setPixmap(icon.pixmap(iconSize, iconSize));
d->m_summaryCheckBox->setIcon(icon);
}
@@ -251,7 +263,7 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
QPainter p(this);
QWidget *topLeftWidget = d->m_useCheckBox ? static_cast<QWidget *>(d->m_summaryCheckBox) : static_cast<QWidget *>(d->m_summaryLabel);
QWidget *topLeftWidget = d->m_useCheckBox ? static_cast<QWidget *>(d->m_summaryCheckBox) : static_cast<QWidget *>(d->m_summaryLabelIcon);
QPoint topLeft(topLeftWidget->geometry().left() - MARGIN, contentsRect().top());
const QRect paintArea(topLeft, contentsRect().bottomRight());