fix icon oblate, shrink icon to have spacing

sonichy · Jan 9, 2019 · 2e15c40 · 2e15c40
1 parent d3049b1
commit 2e15c40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/weatherplugin.cpp b/weatherplugin.cpp
@@ -166,7 +166,7 @@ void WeatherPlugin::invokedMenuItem(const QString &itemKey, const QString &menuI
 
 void WeatherPlugin::MBAbout()
 {
-    QMessageBox aboutMB(QMessageBox::NoIcon, "HTYWeather 5.3", "About\n\nDeepin Linux Dock Weather Plugin.\nAuthor: 黄颖\nE-mail: [email protected]\nSource: https://github.com/sonichy/WEATHER_DDE_DOCK\nAPI: https://openweathermap.org/forecast5");
+    QMessageBox aboutMB(QMessageBox::NoIcon, "HTYWeather 5.3.1", "About\n\nDeepin Linux Dock Weather Plugin.\nAuthor: 黄颖\nE-mail: [email protected]\nSource: https://github.com/sonichy/WEATHER_DDE_DOCK\nAPI: https://openweathermap.org/forecast5");
     aboutMB.setIconPixmap(QPixmap(":/icon/Default/01d.png"));
     aboutMB.exec();
 }

diff --git a/weatherwidget.cpp b/weatherwidget.cpp
@@ -2,8 +2,6 @@
 #include "weatherwidget.h"
 #include <QApplication>
 #include <QPainter>
-#include <QDebug>
-//#include <QSvgRenderer>
 #include <QMouseEvent>
 
 #define PLUGIN_STATE_KEY    "enable"
@@ -56,11 +54,13 @@ void WeatherWidget::paintEvent(QPaintEvent *e)
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing, true);
     painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
-    painter.setPen(Qt::white);
     if (displayMode == Dock::Efficient) {
+        painter.setPen(Qt::white);
         painter.drawText(rect(), Qt::AlignCenter, sw + "\n" + temp);
     } else {
-        painter.drawPixmap(rect(), pixmap);
+        int w = qMin(width(), height());
+        pixmap = pixmap.scaled(w*0.8, w*0.8, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        painter.drawPixmap(rect().center() - pixmap.rect().center(), pixmap);
     }
 }
 
@@ -77,4 +77,4 @@ void WeatherWidget::mousePressEvent(QMouseEvent *e)
     }
 
     QWidget::mousePressEvent(e);
-}
+}