From c72e62a5d08af5a91e5ef3008e0492b0fea32fed Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Mon, 27 Feb 2017 02:16:56 +0200
Subject: [PATCH] fix #12,multi-screen support

--this commit is just a small clean up that
acts as a reference for all the previous
10-12 commits that provide the new anticipated
multi-screen support. With multi-screen support
the user can set for its docks either to be always
on the primary screen or an explicit one... The
docks are loaded and removed automatically on
screen changes
---
 app/dockview.cpp | 45 ---------------------------------------------
 app/dockview.h   |  1 -
 2 files changed, 46 deletions(-)

diff --git a/app/dockview.cpp b/app/dockview.cpp
index 33f59c452..ba93e1761 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -153,25 +153,6 @@ void DockView::init()
     qDebug() << "SOURCE:" << source();
 }
 
-void DockView::adaptToScreen(QScreen *screen)
-{
-    /*    if (!screen) {
-        return;
-    }
-
-    qDebug() << "adapting to screen...";
-
-    setScreen(screen);
-
-    //FIXME:: This code in a multi-screen environment that
-    //primary screen is not set to 0 it creates an endless
-    //showing loop at startup (catch-up race) between screen:0 and primaryScreen
-    if (this->containment())
-        this->containment()->reactToScreenChange();
-
-    syncGeometry(); */
-}
-
 void DockView::setCurrentScreen(const QString id)
 {
     if (!m_screenToFollow || m_screenToFollow->name() == id){
@@ -236,33 +217,7 @@ void DockView::reconsiderScreen()
 
 void DockView::screenChanged(QScreen *scr)
 {
-    //  if (!scr || m_screenToFollow == scr) {
-    //    return;
-    // }
-
-    //  qDebug() << "Screen inconsistency!!! :" << scr->name() << " - " <<m_screenToFollow->name();
     m_screenSyncTimer.start();
-    //QTimer::singleShot(2500, this, &DockView::reconsiderScreen);
-
-    /*bool found{false};
-    foreach(auto scr, qGuiApp->screens()){
-        qDebug() << "Found screen: "<<scr->name();
-        if (scr && scr == m_screenToFollow){
-            found=true;
-            //break;
-        }
-    }
-
-
-
-    if (found) {
-        //IMPORTAT!!! this code creates crashes when changing plasma
-        //layouts it needs inverstigation!!!
-        setScreen(m_screenToFollow);
-        syncGeometry();
-    }*/
-    //  emit docksCountChanged();
-
 }
 
 void DockView::addNewDock()
diff --git a/app/dockview.h b/app/dockview.h
index 1fba11162..6b46081aa 100644
--- a/app/dockview.h
+++ b/app/dockview.h
@@ -74,7 +74,6 @@ public:
 
     void init();
 
-    void adaptToScreen(QScreen *screen);
     void setScreenToFollow(QScreen *screen);
 
     void resizeWindow();