Change signals in corona again.

app/lattecorona.cpp

@@ -228,9 +228,21 @@ void Corona::load()
         m_templatesManager->init();
         m_layoutsManager->init();
 
-        connect(this, &Corona::availableScreenRectChangedFrom, this, &Plasma::Corona::availableScreenRectChanged, Qt::UniqueConnection);
-        connect(this, &Corona::availableScreenRegionChangedFrom, this, &Plasma::Corona::availableScreenRegionChanged, Qt::UniqueConnection);
-        //
+        // We must extract Screen Id from the signalled view.
+        connect(this, &Corona::availableScreenRectChangedFrom,
+                this, [this](Latte::View *view) {
+                    Plasma::Corona* corona = static_cast<Plasma::Corona*>(this);
+                    int screenId = view->positioner()->currentScreenId();
+                    corona->availableScreenRectChanged(screenId);
+                },
+                Qt::UniqueConnection);
+        connect(this, &Corona::availableScreenRegionChangedFrom,
+                this, [this](Latte::View *view) {
+                    Plasma::Corona* corona = static_cast<Plasma::Corona*>(this);
+                    int screenId = view->positioner()->currentScreenId();
+                    corona->availableScreenRegionChanged(screenId);
+                },
+                Qt::UniqueConnection);
         connect(m_screenPool, &ScreenPool::primaryScreenChanged, this, &Corona::onScreenCountChanged, Qt::UniqueConnection);
 
         QString loadLayoutName = "";

app/lattecorona.h

@@ -176,13 +176,8 @@ signals:
     void configurationShown(PlasmaQuick::ConfigView *configView);
     void viewLocationChanged();
     void raiseViewsTemporaryChanged();
-//  FIXME:
-//    Old versions of these signals had Latte::View argument.
-//    Check if it is still needed somewhere.
-//    void availableScreenRectChangedFrom(Latte::View *origin, int id);
-//    void availableScreenRegionChangedFrom(Latte::View *origin, int id);
-    void availableScreenRectChangedFrom(int id);
-    void availableScreenRegionChangedFrom(int id);
+    void availableScreenRectChangedFrom(Latte::View *origin);
+    void availableScreenRegionChangedFrom(Latte::View *origin);
     void verticalUnityViewHasFocus();
 
 private slots: