Commit 59e3e21c authored by Vlad Zahorodnii's avatar Vlad Zahorodnii
Browse files

[effects/sheet] Drop IsSheetWindow hack

When the Sheet effect was written, isModal worked only for Client
windows, not Deleted windows:

    bool EffectWindowImpl::isModal() const
        if( Client* c = dynamic_cast< Client* >( toplevel ))
            return c->isModal();
        return false;

so the Sheet effect had to track windows by using WindowInfo class, e.g.

    class WindowInfo
            bool deleted;
            bool added;
            bool closed;

the biggest drawback of that method is that WindowInfo for each modal kept around
as long as those modals existed. It also was adding little overhead, e.g.

    void SheetEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
        if( windows.contains( w ) && ( windows[ w ].added || windows[ w ].closed ) )

Things changed with a8160b3c31afa1db24084147ad4ce50cf3c0314a. With that
commit, WindowInfo kept only for modals that are currently being
animated, but isModal still worked only with Client windows, so
IsSheetWindow hack had been introduced.

Long story short: we don't need IsSheetWindow hack anymore because
isModal now works with Deleted windows.

Test Plan: Pressed Ctrl+O in Kate.

Reviewers: #kwin, graesslin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision:
parent afc80f8b
......@@ -31,8 +31,6 @@ along with this program. If not, see <>.
namespace KWin
static const int IsSheetWindow = 0x22A982D5;
......@@ -123,7 +121,6 @@ void SheetEffect::slotWindowAdded(EffectWindow* w)
if (!isSheetWindow(w))
w->setData(IsSheetWindow, true);
InfoMap::iterator it = windows.find(w);
WindowInfo *info = (it == windows.end()) ? &windows[w] : &it.value();
......@@ -181,7 +178,7 @@ void SheetEffect::slotWindowDeleted(EffectWindow* w)
bool SheetEffect::isSheetWindow(EffectWindow* w)
return (w->isModal() || w->data(IsSheetWindow).toBool());
return w->isModal();
bool SheetEffect::isActive() const
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment