fixed issue with multiscreen setup (#971)

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

1 files changed, 12 insertions, 6 deletions

diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 7a87432ee..46765c67f 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -147,15 +147,21 @@ void EqWidget::readSettings()
 {
     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
     QScreen *screen = QGuiApplication::primaryScreen();
+    QRect availableGeometry = screen->availableGeometry();
     QPoint pos = settings.value("Skinned/eq_pos", QPoint(100, 216)).toPoint();
-    if(!screen->availableGeometry().contains(pos))
+    int r = m_skin->ratio();
+    //TODO QGuiApplication::screenAt
+    foreach(QScreen *screen, QGuiApplication::screens())
     {
-        QRect availableGeometry = screen->availableGeometry();
-        int r = m_skin->ratio();
-        pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
-        pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
+        if(screen->availableGeometry().contains(pos))
+        {
+           availableGeometry = screen->availableGeometry();
+           break;
+        }
     }
-    move (pos); //geometry
+    pos.setX(qBound(availableGeometry.left(), pos.x(), availableGeometry.right() - r*275));
+    pos.setY(qBound(availableGeometry.top(), pos.y(), availableGeometry.bottom() - r*116));
+    move(pos); //geometry
     readEq();
     m_autoButton->setChecked(settings.value("Skinned/eq_auto", false).toBool());
     //equalizer presets