fixed cover image alignment

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7703 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 14 insertions, 11 deletions

diff --git a/src/plugins/Ui/qsui/coverwidget.cpp b/src/plugins/Ui/qsui/coverwidget.cpp
index 71d395d81..afe948207 100644
--- a/src/plugins/Ui/qsui/coverwidget.cpp
+++ b/src/plugins/Ui/qsui/coverwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -50,13 +50,13 @@ void CoverWidget::clearCover()
     update();
 }
 
-void CoverWidget::paintEvent(QPaintEvent *p)
+void CoverWidget::paintEvent(QPaintEvent *)
 {
-    QPainter paint(this);
     if(!m_pixmap.isNull())
     {
-        int w = qMin(p->rect().width(), p->rect().height());
-        paint.drawPixmap(0,0, m_pixmap.scaled(w,w,Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+        QPainter paint(this);
+        QPixmap pixmap = m_pixmap.scaled(size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        paint.drawPixmap((width() - pixmap.width()) / 2, (height() - pixmap.height()) / 2, pixmap);
     }
 }
 
diff --git a/src/plugins/Ui/qsui/coverwidget.h b/src/plugins/Ui/qsui/coverwidget.h
index 235afdb9e..92a324de1 100644
--- a/src/plugins/Ui/qsui/coverwidget.h
+++ b/src/plugins/Ui/qsui/coverwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013 by Ilya Kotov                                      *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -43,7 +43,7 @@ private slots:
     void saveAs();
 
 private:
-    void paintEvent (QPaintEvent *event);
+    void paintEvent (QPaintEvent *);
     QPixmap m_pixmap;
 };
 
diff --git a/src/qmmpui/coverviewer.cpp b/src/qmmpui/coverviewer.cpp
index 85e27651d..a27702244 100644
--- a/src/qmmpui/coverviewer.cpp
+++ b/src/qmmpui/coverviewer.cpp
@@ -42,11 +42,14 @@ void CoverViewer::setPixmap(const QPixmap &pixmap)
     update();
 }
 
-void CoverViewer::paintEvent(QPaintEvent *p)
+void CoverViewer::paintEvent(QPaintEvent *)
 {
-    QPainter paint(this);
     if(!m_pixmap.isNull())
-        paint.drawPixmap(0,0, m_pixmap.scaled(p->rect().size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    {
+        QPainter paint(this);
+        QPixmap pixmap = m_pixmap.scaled(size().width() - 20, size().height() - 20, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        paint.drawPixmap((width() - pixmap.width()) / 2, (height() - pixmap.height()) / 2, pixmap);
+    }
 }
 
 void CoverViewer::saveAs()
diff --git a/src/qmmpui/coverviewer_p.h b/src/qmmpui/coverviewer_p.h
index c2822fc5f..bef464bc0 100644
--- a/src/qmmpui/coverviewer_p.h
+++ b/src/qmmpui/coverviewer_p.h
@@ -41,7 +41,7 @@ public:
     void setPixmap(const QPixmap&);
 
 protected:
-    void paintEvent(QPaintEvent *event);
+    void paintEvent(QPaintEvent *);
 
 private slots:
     void saveAs();