From 7f4071c7d4a492192de88b81aacabe9070717f41 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 22 Feb 2023 12:47:58 +0200 Subject: [PATCH] Drop Window::addWorkspaceRepaint It's used only by window elevation logic, but it can be moved inside libkwineffects. It should also fix missing repainting in scripted effects. --- src/effects.cpp | 1 + src/window.cpp | 20 -------------------- src/window.h | 4 ---- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/effects.cpp b/src/effects.cpp index b06bc70b42..54a92193af 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -1143,6 +1143,7 @@ void EffectsHandlerImpl::setElevatedWindow(KWin::EffectWindow *w, bool set) if (set) { elevated_windows.append(w); } + addRepaint(w->expandedGeometry()); } void EffectsHandlerImpl::setTabBoxWindow(EffectWindow *w) diff --git a/src/window.cpp b/src/window.cpp index 6a53189931..e5490f6e57 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -369,25 +369,6 @@ void Window::finishCompositing(ReleaseReason releaseReason) m_windowItem.reset(); } -void Window::addWorkspaceRepaint(int x, int y, int w, int h) -{ - addWorkspaceRepaint(QRectF(x, y, w, h)); -} - -void Window::addWorkspaceRepaint(const QRectF &r2) -{ - if (Compositor::compositing()) { - Compositor::self()->scene()->addRepaint(r2.toAlignedRect()); - } -} - -void Window::addWorkspaceRepaint(const QRegion ®ion) -{ - if (Compositor::compositing()) { - Compositor::self()->scene()->addRepaint(region); - } -} - void Window::setReadyForPainting() { if (!ready_for_painting) { @@ -543,7 +524,6 @@ void Window::elevate(bool elevate) return; } effectWindow()->elevate(elevate); - addWorkspaceRepaint(visibleGeometry()); } pid_t Window::pid() const diff --git a/src/window.h b/src/window.h index 7364c689eb..1a401430b4 100644 --- a/src/window.h +++ b/src/window.h @@ -718,10 +718,6 @@ public: bool hasAlpha() const; virtual bool setupCompositing(); virtual void finishCompositing(ReleaseReason releaseReason = ReleaseReason::Release); - // these call workspace->addRepaint(), but first transform the damage if needed - void addWorkspaceRepaint(const QRectF &r); - void addWorkspaceRepaint(int x, int y, int w, int h); - void addWorkspaceRepaint(const QRegion ®ion); EffectWindowImpl *effectWindow(); const EffectWindowImpl *effectWindow() const; SurfaceItem *surfaceItem() const;