Connecting effects handlers in slotWindowAdded

zzag · May 2, 2024 · a2c1326 · a2c1326
1 parent 11ac984
commit a2c1326
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/YetAnotherMagicLampEffect.cc b/src/YetAnotherMagicLampEffect.cc
@@ -41,15 +41,18 @@ YetAnotherMagicLampEffect::YetAnotherMagicLampEffect()
 {
     reconfigure(ReconfigureAll);
 
-    connect(KWin::effects, &KWin::EffectsHandler::windowMinimized,
-        this, &YetAnotherMagicLampEffect::slotWindowMinimized);
-    connect(KWin::effects, &KWin::EffectsHandler::windowUnminimized,
-        this, &YetAnotherMagicLampEffect::slotWindowUnminimized);
+    connect(KWin::effects, &KWin::EffectsHandler::windowAdded,
+        this, &YetAnotherMagicLampEffect::slotWindowAdded);
     connect(KWin::effects, &KWin::EffectsHandler::windowDeleted,
         this, &YetAnotherMagicLampEffect::slotWindowDeleted);
     connect(KWin::effects, &KWin::EffectsHandler::activeFullScreenEffectChanged,
         this, &YetAnotherMagicLampEffect::slotActiveFullScreenEffectChanged);
 
+    const auto windows = KWin::effects->stackingOrder();
+    for (KWin::EffectWindow *window : windows) {
+        YetAnotherMagicLampEffect::slotWindowAdded(window);
+    }
+
     setVertexSnappingMode(KWin::RenderGeometry::VertexSnappingMode::None);
 }
 
@@ -203,6 +206,12 @@ bool YetAnotherMagicLampEffect::supported()
     return false;
 }
 
+void YetAnotherMagicLampEffect::slotWindowAdded(KWin::EffectWindow *w)
+{
+    connect(w, &KWin::EffectWindow::minimizedChanged, this, &MagicLampEffect::slotWindowMinimized);
+    connect(w, &KWin::EffectWindow::clientUnminimized, this, &YetAnotherMagicLampEffect::slotWindowUnminimized);
+}
+
 void YetAnotherMagicLampEffect::slotWindowMinimized(KWin::EffectWindow* w)
 {
     if (KWin::effects->activeFullScreenEffect()) {

diff --git a/src/YetAnotherMagicLampEffect.h b/src/YetAnotherMagicLampEffect.h
@@ -53,6 +53,7 @@ class YetAnotherMagicLampEffect : public KWin::OffscreenEffect {
     void apply(KWin::EffectWindow* window, int mask, KWin::WindowPaintData& data, KWin::WindowQuadList& quads) override;
 
 private Q_SLOTS:
+    void slotWindowAdded(KWin::EffectWindow* w);
     void slotWindowMinimized(KWin::EffectWindow* w);
     void slotWindowUnminimized(KWin::EffectWindow* w);
     void slotWindowDeleted(KWin::EffectWindow* w);