From f14dc75d063be389ce8416c83910ce2a957dc061 Mon Sep 17 00:00:00 2001 From: shaojun Date: Sat, 28 Sep 2019 17:23:10 +0800 Subject: [PATCH] fixed(bug:3589):icon not in center --- plugins/disk-mount/diskpluginitem.cpp | 4 +++- plugins/onboard/onboarditem.cpp | 4 +++- plugins/overlay-warning/pluginwidget.cpp | 4 +++- plugins/shutdown/pluginwidget.cpp | 4 +++- plugins/trash/trashwidget.cpp | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/plugins/disk-mount/diskpluginitem.cpp b/plugins/disk-mount/diskpluginitem.cpp index a4b525cd6..4dc2454a4 100644 --- a/plugins/disk-mount/diskpluginitem.cpp +++ b/plugins/disk-mount/diskpluginitem.cpp @@ -46,7 +46,9 @@ void DiskPluginItem::paintEvent(QPaintEvent *e) QWidget::paintEvent(e); QPainter painter(this); - painter.drawPixmap(rect().center() - m_icon.rect().center(), m_icon); + const QRectF &rf = QRectF(rect()); + const QRectF &rfp = QRectF(m_icon.rect()); + painter.drawPixmap(rf.center() - rfp.center(), m_icon); } void DiskPluginItem::resizeEvent(QResizeEvent *e) diff --git a/plugins/onboard/onboarditem.cpp b/plugins/onboard/onboarditem.cpp index 937a182ef..09da25827 100644 --- a/plugins/onboard/onboarditem.cpp +++ b/plugins/onboard/onboarditem.cpp @@ -107,7 +107,9 @@ void OnboardItem::paintEvent(QPaintEvent *e) pixmap = loadSvg(iconName, QSize(iconSize, iconSize)); painter.setOpacity(1); - painter.drawPixmap(rect().center() - pixmap.rect().center() / devicePixelRatioF(), pixmap); + const QRectF &rf = QRectF(rect()); + const QRectF &rfp = QRectF(pixmap.rect()); + painter.drawPixmap(rf.center() - rfp.center() / devicePixelRatioF(), pixmap); } const QPixmap OnboardItem::loadSvg(const QString &fileName, const QSize &size) const diff --git a/plugins/overlay-warning/pluginwidget.cpp b/plugins/overlay-warning/pluginwidget.cpp index 6e31ef660..aa1d5240f 100644 --- a/plugins/overlay-warning/pluginwidget.cpp +++ b/plugins/overlay-warning/pluginwidget.cpp @@ -57,7 +57,9 @@ void PluginWidget::paintEvent(QPaintEvent *e) pixmap = loadSvg(iconName, QSize(iconSize, iconSize)); QPainter painter(this); - painter.drawPixmap(rect().center() - pixmap.rect().center() / devicePixelRatioF(), pixmap); + const QRectF &rf = QRectF(rect()); + const QRectF &rfp = QRectF(pixmap.rect()); + painter.drawPixmap(rf.center() - rfp.center() / devicePixelRatioF(), pixmap); } const QPixmap PluginWidget::loadSvg(const QString &fileName, const QSize &size) const diff --git a/plugins/shutdown/pluginwidget.cpp b/plugins/shutdown/pluginwidget.cpp index 1100b7e9f..de2e06c20 100644 --- a/plugins/shutdown/pluginwidget.cpp +++ b/plugins/shutdown/pluginwidget.cpp @@ -104,7 +104,9 @@ void PluginWidget::paintEvent(QPaintEvent *e) painter.setOpacity(1); pixmap = loadSvg(iconName, QSize(iconSize, iconSize)); - painter.drawPixmap(rect().center() - pixmap.rect().center() / devicePixelRatioF(), pixmap); + const QRectF &rf = QRectF(rect()); + const QRectF &rfp = QRectF(pixmap.rect()); + painter.drawPixmap(rf.center() - rfp.center() / pixmap.devicePixelRatioF(), pixmap); } const QPixmap PluginWidget::loadSvg(const QString &fileName, const QSize &size) const diff --git a/plugins/trash/trashwidget.cpp b/plugins/trash/trashwidget.cpp index c3a8b5981..9c3cdb225 100644 --- a/plugins/trash/trashwidget.cpp +++ b/plugins/trash/trashwidget.cpp @@ -171,7 +171,9 @@ void TrashWidget::paintEvent(QPaintEvent *e) updateIcon(); - painter.drawPixmap(rect().center() - m_icon.rect().center() / devicePixelRatioF(), m_icon); + const QRectF &rf = QRectF(rect()); + const QRectF &rfp = QRectF(m_icon.rect()); + painter.drawPixmap(rf.center() - rfp.center() / devicePixelRatioF(), m_icon); } void TrashWidget::resizeEvent(QResizeEvent *e)