yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[effects/sheet] Drop IsSheetWindow hack

Browse source 
Summary:
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
        {
        public:
            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: https://phabricator.kde.org/D14246
This commit is contained in:
Vlad Zagorodniy 2018-07-20 11:17:49 +03:00
parent afc80f8bd5
commit 59e3e21c47
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
effects/sheet/sheet.cpp
View file

@ -31,8 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin
{
static const int IsSheetWindow = 0x22A982D5;
SheetEffect::SheetEffect()
{
initConfig<SheetConfig>();
@ -123,7 +121,6 @@ void SheetEffect::slotWindowAdded(EffectWindow* w)
{
if (!isSheetWindow(w))
return;
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