Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid repeating default pixmap size of IconButton all over the place

This commit is contained in:
Martchus 2020-06-14 14:56:03 +02:00
parent 8ee82c9a3c
commit 793bd00cb6
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/buttonoverlay.cpp
View File

@ -138,8 +138,8 @@ void ButtonOverlay::setClearButtonEnabled(bool enabled)
// enable clear button
m_clearButton = new IconButton;
m_clearButton->setHidden(isCleared());
m_clearButton->setPixmap(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(16));
m_clearButton->setGeometry(0, 0, 16, 16);
m_clearButton->setPixmap(QIcon::fromTheme(QStringLiteral("edit-clear")).pixmap(IconButton::defaultPixmapSize));
m_clearButton->setGeometry(QRect(QPoint(), IconButton::defaultPixmapSize));
m_clearButton->setToolTip(QObject::tr("Clear"));
QObject::connect(m_clearButton, &IconButton::clicked, std::bind(&ButtonOverlay::handleClearButtonClicked, this));
m_buttonLayout->addWidget(m_clearButton);
@ -167,7 +167,7 @@ void ButtonOverlay::enableInfoButton(const QPixmap &pixmap, const QString &infoT
auto *infoButton = static_cast<IconButton *>(m_infoButtonOrAction);
if (!infoButton) {
m_infoButtonOrAction = infoButton = new IconButton;
infoButton->setGeometry(0, 0, 16, 16);
infoButton->setGeometry(QRect(QPoint(), IconButton::defaultPixmapSize));
QObject::connect(infoButton, &IconButton::clicked, std::bind(&ButtonOverlay::showInfo, this));
if (m_clearButton) {
m_buttonLayout->insertWidget(m_buttonLayout->count() - 2, infoButton);
@ -332,7 +332,7 @@ void ButtonOverlay::fallbackToUsingCustomLayout()
if ((iconAction = static_cast<QAction *>(m_infoButtonOrAction))) {
const auto icon = iconAction->icon();
const auto sizes = icon.availableSizes();
infoPixmap = icon.pixmap(sizes.empty() ? QSize(16, 16) : sizes.front());
infoPixmap = icon.pixmap(sizes.empty() ? IconButton::defaultPixmapSize : sizes.front());
infoText = iconAction->toolTip();
disableInfoButton();
}

2
widgets/iconbutton.cpp
View File

@ -69,7 +69,7 @@ void IconButton::assignDataFromAction(const QAction *action)
auto const icon = action->icon();
const auto sizes = icon.availableSizes();
const auto text = action->text();
setPixmap(icon.pixmap(sizes.empty() ? QSize(16, 16) : sizes.front()));
setPixmap(icon.pixmap(sizes.empty() ? defaultPixmapSize : sizes.front()));
setToolTip(text.isEmpty() ? action->toolTip() : text);
}

3
widgets/iconbutton.h
View File

@ -6,6 +6,7 @@
#include <QAbstractButton>
#include <QAction>
#include <QPixmap>
#include <QSize>
#include <cstdint>
@ -24,6 +25,8 @@ public:
void setPixmap(const QPixmap &pixmap);
QSize sizeHint() const override;
static constexpr auto defaultPixmapSize = QSize(16, 16);
protected:
void paintEvent(QPaintEvent *event) override;
void keyPressEvent(QKeyEvent *event) override;