From d60fca20229e73cb21174c8b1d919142e348b27a Mon Sep 17 00:00:00 2001 From: audoban <audoban@openmailbox.org> Date: Sun, 25 Dec 2016 19:10:52 -0500 Subject: [PATCH] fixed, screenForContainment --- corona/nowdockcorona.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/corona/nowdockcorona.cpp b/corona/nowdockcorona.cpp index 0a380bcad..a57e73e98 100644 --- a/corona/nowdockcorona.cpp +++ b/corona/nowdockcorona.cpp @@ -134,16 +134,10 @@ QList<Plasma::Types::Location> NowDockCorona::freeEdges(int screen) const int NowDockCorona::screenForContainment(const Plasma::Containment *containment) const { - return 0; - - while (const auto *parentCont = qobject_cast<const Plasma::Applet *>(containment->parent())) { - if (parentCont->isContainment()) - containment = qobject_cast<const Plasma::Containment *>(parentCont); - } - for (auto *view : m_containments) { - if (view && view->containment() == containment) - return containment->screen(); + if (view && view->containment() && view->containment()->id() == containment->id()) + if (view->screen()) + return qGuiApp->screens().indexOf(view->screen()); } return -1;