From 727c0fd7c957127532748b11d1b9200845ea884a Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 19 Apr 2018 17:37:16 +0200
Subject: [PATCH] use candidatecontainments

---
 shell/contents/views/Desktop.qml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml
index 491215cf..fa3f310a 100644
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@@ -40,7 +40,17 @@ Item {
     property int notificationId: 0;
     property int buttonHeight: width/4
     property bool loadCompleted: false
+    property var candidateContainments: Object
 
+    Connections {
+        target: desktop
+        onCandidateContainmentsChanged: {
+            for (var i = 0; i < desktop.candidateContainments.length; ++i) {
+                var cont = desktop.candidateContainments[i];
+                root.candidateContainments[cont.activity] = cont;
+            }
+        }
+    }
     XAnimator {
         id: switchAnim
         target: activitiesLayout
@@ -124,7 +134,8 @@ Item {
                     }
                     onInViewportChanged: {
                         if (inViewport && !mainDelegate.containment) {
-                            mainDelegate.containment = desktop.containmentItemForActivity(model.id);
+                            mainDelegate.containment = root.candidateContainments[model.id];
+                            //desktop.containmentItemForActivity(model.id);
                             containmentNextActivityPreview = containment;
                             mainDelegate.containment.parent = mainDelegate;
                             mainDelegate.containment.anchors.fill = mainDelegate;
@@ -135,15 +146,6 @@ Item {
                             activitiesView.currentIndex = index;
                         }
                     }
-                    /*DEBUG TODO remove
-                    Text {
-                        z: 100
-                        text: "inViewport: " + mainDelegate.inViewport +
-                            "\n -activitiesLayout.x: " + -activitiesLayout.x +
-                            "\n mainDelegate.x: "+ mainDelegate.x +
-                            "\n (-activitiesLayout.x + activitiesView.width):"+ (-activitiesLayout.x + activitiesView.width) +
-                            "\n (mainDelegate.x + mainDelegate.width):" + (mainDelegate.x + mainDelegate.width)
-                    }*/
                 }
             }
         }