cycle properly config views with Meta+A

app/layout/centrallayout.cpp

@@ -213,6 +213,8 @@ void CentralLayout::setSharedLayout(SharedLayout *layout)
         m_sharedConnections << connect(m_sharedLayout, &Layout::GenericLayout::viewEdgeChanged, this, [this]() {
             syncLatteViewsToScreens();
         });
+
+        m_sharedConnections << connect(m_sharedLayout, &GenericLayout::lastConfigViewForChanged, this, &GenericLayout::lastConfigViewForChanged);
     } else {
         setSharedLayoutName(QString());
     }
@@ -231,6 +233,24 @@ void CentralLayout::disconnectSharedConnections()
     m_sharedConnections.clear();
 }
 
+void CentralLayout::setLastConfigViewFor(Latte::View *view)
+{
+    if (m_sharedLayout) {
+        m_sharedLayout->setLastConfigViewFor(view);
+    } else {
+        GenericLayout::setLastConfigViewFor(view);
+    }
+}
+
+Latte::View *CentralLayout::lastConfigViewFor()
+{
+    if (m_sharedLayout) {
+        return m_sharedLayout->lastConfigViewFor();
+    } else {
+        return GenericLayout::lastConfigViewFor();
+    }
+}
+
 void CentralLayout::loadConfig()
 {
     m_disableBordersForMaximizedWindows = m_layoutGroup.readEntry("disableBordersForMaximizedWindows", false);
@@ -269,16 +289,6 @@ void CentralLayout::addView(Plasma::Containment *containment, bool forceOnPrimar
     }
 }
 
-bool CentralLayout::configViewIsShown() const
-{
-    bool genericShown = GenericLayout::configViewIsShown();
-    if (m_sharedLayout) {
-        return (m_sharedLayout->configViewIsShown() || genericShown);
-    }
-
-    return genericShown;
-}
-
 const QStringList CentralLayout::appliedActivities()
 {
     if (!m_corona) {

app/layout/centrallayout.h

@@ -74,7 +74,6 @@ public:
     void addView(Plasma::Containment *containment, bool forceOnPrimary = false, int explicitScreen = -1, Layout::ViewsMap *occupied = nullptr) override;
     void syncLatteViewsToScreens(Layout::ViewsMap *occupiedMap = nullptr) override;
     void unloadContainments() override;
-    bool configViewIsShown() const override;
     const QStringList appliedActivities() override;
     Types::ViewType latteViewType(uint containmentId) const override;
     QList<Latte::View *> latteViews() override;
@@ -85,6 +84,9 @@ public:
 
     Layout::Type type() const override;
 
+    void setLastConfigViewFor(Latte::View *view) override;
+    Latte::View *lastConfigViewFor() override;
+
     //! Available edges for specific view in that screen
     QList<Plasma::Types::Location> availableEdgesForView(QScreen *scr, Latte::View *forView) const override;
     //! All free edges in that screen

app/layout/genericlayout.cpp

@@ -152,17 +152,6 @@ void GenericLayout::setBlockAutomaticLatteViewCreation(bool block)
     m_blockAutomaticLatteViewCreation = block;
 }
 
-bool GenericLayout::configViewIsShown() const
-{
-    for (const auto view : m_latteViews) {
-        if (view && view->settingsWindowIsShown()) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 bool GenericLayout::isActive() const
 {
     if (!m_corona) {
@@ -378,11 +367,6 @@ Latte::View *GenericLayout::highestPriorityView()
 
 Latte::View *GenericLayout::lastConfigViewFor()
 {
-    if (!latteViews().contains(m_lastConfigViewFor)) {
-        m_lastConfigViewFor = nullptr;
-        return nullptr;
-    }
-
     return m_lastConfigViewFor;
 }
 

app/layout/genericlayout.h

@@ -90,8 +90,6 @@ public:
     bool isInternalContainment(Plasma::Applet *applet) const;
     Plasma::Containment *internalContainmentOf(Plasma::Applet *applet) const;
 
-    virtual bool configViewIsShown() const;
-
     virtual int viewsCount(int screen) const;
     virtual int viewsCount(QScreen *screen) const;
     virtual int viewsCount() const;

app/layout/sharedlayout.cpp

@@ -238,28 +238,6 @@ QList<Plasma::Types::Location> SharedLayout::freeEdges(int screen) const
     return Layout::GenericLayout::freeEdges(screen);
 }
 
-void SharedLayout::setLastConfigViewFor(Latte::View *view)
-{
-    CentralLayout *current = currentCentralLayout();
-
-    if (current) {
-        return current->setLastConfigViewFor(view);
-    }
-
-    return GenericLayout::setLastConfigViewFor(view);
-}
-
-Latte::View *SharedLayout::lastConfigViewFor()
-{
-    CentralLayout *current = currentCentralLayout();
-
-    if (current) {
-        return current->lastConfigViewFor();
-    }
-
-    return GenericLayout::lastConfigViewFor();
-}
-
 QList<Latte::View *> SharedLayout::sortedLatteViews(QList<Latte::View *> views)
 {
     CentralLayout *current = currentCentralLayout();

app/layout/sharedlayout.h

@@ -60,9 +60,6 @@ public:
 
     Layout::Type type() const override;
 
-    void setLastConfigViewFor(Latte::View *view) override;
-    Latte::View *lastConfigViewFor() override;
-
     //! Available edges for specific view in that screen
     QList<Plasma::Types::Location> availableEdgesForView(QScreen *scr, Latte::View *forView) const override;
     //! All free edges in that screen

app/shortcuts/globalshortcuts.cpp

@@ -525,7 +525,7 @@ void GlobalShortcuts::showSettings()
     if (sortedViews.count() > 0) {
         int openSettings = -1;
 
-        //! check if there is a view with opened settings window
+        //! find last view that showed its config view
         for (int i = 0; i < sortedViews.size(); ++i) {
             if (sortedViews[i] == currentLayout->lastConfigViewFor()) {
                 openSettings = i;
@@ -534,7 +534,8 @@ void GlobalShortcuts::showSettings()
         }
 
         if (openSettings >= 0 && sortedViews.count() > 1) {
-            openSettings = currentLayout->configViewIsShown() ? openSettings + 1 : openSettings;
+            //! check if there is a view with opened settings window
+            openSettings = sortedViews[openSettings]->settingsWindowIsShown() ? openSettings + 1 : openSettings;
 
             if (openSettings >= sortedViews.size()) {
                 openSettings = 0;

app/view/view.h

@@ -226,7 +226,6 @@ public:
     QStringList activities() const;
     void setActivities(const QStringList &ids);
 
-
     bool settingsWindowIsShown();
     void showSettingsWindow();