From 5f77ef3b41cc20c62b53124378338772ddeb952f Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 26 Feb 2017 23:46:20 +0200
Subject: [PATCH] drop dock primary screen behavior from plasma

--this cleans the plasma behavior for the
primary screen that was creating a mess.
The dock "on primary" state can now be implemented
through Latte without breaking things
---
 app/screenpool.cpp                              | 15 ++++++++++-----
 shell/contents/configuration/BehaviorConfig.qml |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/screenpool.cpp b/app/screenpool.cpp
index 3901df277..d51225f53 100644
--- a/app/screenpool.cpp
+++ b/app/screenpool.cpp
@@ -53,14 +53,15 @@ void ScreenPool::load()
     if (primary) {
         m_primaryConnector = primary->name();
         if (!m_primaryConnector.isEmpty()) {
-            m_connectorForId[0] = m_primaryConnector;
-            m_idForConnector[m_primaryConnector] = 0;
+            //m_connectorForId[0] = m_primaryConnector;
+            //m_idForConnector[m_primaryConnector] = 0;
         }
     }
 
     //restore the known ids to connector mappings
     foreach (const QString &key, m_configGroup.keyList()) {
         QString connector = m_configGroup.readEntry(key, QString());
+        qDebug() << "connector :" << connector << " - " <<key;
         if (!key.isEmpty() && !connector.isEmpty() &&
             !m_connectorForId.contains(key.toInt()) &&
             !m_idForConnector.contains(connector)) {
@@ -142,10 +143,11 @@ void ScreenPool::insertScreenMapping(int id, const QString &connector)
 
     if (id == 0) {
         m_primaryConnector = connector;
+    } else {
+        m_connectorForId[id] = connector;
+        m_idForConnector[connector] = id;
     }
 
-    m_connectorForId[id] = connector;
-    m_idForConnector[connector] = id;
     save();
 }
 
@@ -167,7 +169,10 @@ QString ScreenPool::connector(int id) const
 
 int ScreenPool::firstAvailableId() const
 {
-    int i = 0;
+    //start counting from 10, first numbers will
+    //be used for special cases.
+    //e.g primaryScreen, id=0
+    int i = 10;
     //find the first integer not stored in m_connectorForId
     //m_connectorForId is the only map, so the ids are sorted
     foreach (int existingId, m_connectorForId.keys()) {
diff --git a/shell/contents/configuration/BehaviorConfig.qml b/shell/contents/configuration/BehaviorConfig.qml
index be885b537..79fde3889 100644
--- a/shell/contents/configuration/BehaviorConfig.qml
+++ b/shell/contents/configuration/BehaviorConfig.qml
@@ -57,7 +57,7 @@ PlasmaComponents.Page {
                 Layout.leftMargin: units.smallSpacing * 2
                 Layout.rightMargin: units.smallSpacing * 2
                 spacing: 1
-                visible: false
+                visible: true
 
                 function updateScreens() {
                     if (dock.screens.length > 1)