feat(effect): make magiclamp look good with hidden panels

If the panel is hidden, the animation can be clipped some distance away from the screen edge. To fix that, move the icon offscreen.
winft · Jul 10, 2023 · 5d39eb5 · 5d39eb5
1 parent 118e009
commit 5d39eb5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/lib/effect/kwineffects/effect_window.h b/lib/effect/kwineffects/effect_window.h
@@ -367,6 +367,7 @@ class KWINEFFECTS_EXPORT EffectWindow : public QObject
     virtual void unrefWindow() = 0;
 
     virtual bool isDeleted() const = 0;
+    virtual bool isHidden() const = 0;
 
     virtual bool isMinimized() const = 0;
     virtual double opacity() const = 0;

diff --git a/lib/render/effect/window_impl.h b/lib/render/effect/window_impl.h
@@ -151,6 +151,13 @@ class effects_window_impl : public EffectWindow
             *window.ref_win);
     }
 
+    bool isHidden() const override
+    {
+        return std::visit(
+            overload{[](auto&& ref_win) { return static_cast<bool>(ref_win->isHiddenInternal()); }},
+            *window.ref_win);
+    }
+
     bool isMinimized() const override
     {
         return std::visit(overload{[](auto&& ref_win) {

diff --git a/plugins/effects/magiclamp/magiclamp.cpp b/plugins/effects/magiclamp/magiclamp.cpp
@@ -159,6 +159,25 @@ void MagicLampEffect::apply(effect::window_paint_data& data, WindowQuadList& qua
                         position = Right;
                     }
                 }
+
+                // If the panel is hidden, move the icon offscreen so the animation looks correct.
+                if (panel->isHidden()) {
+                    const QRectF panelScreen = effects->clientArea(ScreenArea, panel);
+                    switch (position) {
+                    case Bottom:
+                        icon.moveTop(panelScreen.y() + panelScreen.height());
+                        break;
+                    case Top:
+                        icon.moveTop(panelScreen.y() - icon.height());
+                        break;
+                    case Left:
+                        icon.moveLeft(panelScreen.x() - icon.width());
+                        break;
+                    case Right:
+                        icon.moveLeft(panelScreen.x() + panelScreen.width());
+                        break;
+                    }
+                }
             } else {
                 // we did not find a panel, so it might be autohidden
                 QRect iconScreen