kde-fix
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FadeIn/FadeOut effects are succeeded by Fade.

Browse Source 
CCMAIL: philip.falkner@gmail.com


svn path=/branches/work/kwin_composite/; revision=636634
master
Luboš Luňák 18 years ago
parent 9dda6936a7
commit 5f02d68fb9
6 changed files with 0 additions and 212 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape Escape View File

@ -63,8 +63,6 @@ set(kwin_KDEINIT_SRCS
deleted.cpp
effects.cpp
effects/fade.cpp
effects/fadein.cpp
effects/fadeout.cpp
effects/maketransparent.cpp
effects/scalein.cpp
effects/shakymove.cpp

4
effects.cpp
Unescape Escape View File

@ -18,8 +18,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include "effects/desktopchangeslide.h"
#include "effects/dialogparent.h"
#include "effects/fade.h"
#include "effects/fadein.h"
#include "effects/fadeout.h"
#include "effects/howto.h"
#include "effects/maketransparent.h"
#include "effects/minimizeanimation.h"
@ -146,8 +144,6 @@ EffectsHandler::EffectsHandler()
registerEffect("ShakyMove", new GenericEffectFactory<ShakyMoveEffect>);
registerEffect("ShiftWorkspaceUp", new GenericEffectFactory<ShiftWorkspaceUpEffect>);
registerEffect("Fade", new GenericEffectFactory<FadeEffect>);
registerEffect("FadeIn", new GenericEffectFactory<FadeInEffect>);
registerEffect("FadeOut", new GenericEffectFactory<FadeOutEffect>);
registerEffect("ScaleIn", new GenericEffectFactory<ScaleInEffect>);
registerEffect("DialogParent", new GenericEffectFactory<DialogParentEffect>);
registerEffect("DesktopChangeSlide", new GenericEffectFactory<DesktopChangeSlideEffect>);

65
effects/fadein.cpp
Unescape Escape View File

@ -1,65 +0,0 @@
/*****************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
#include "fadein.h"
#include <client.h>
namespace KWinInternal
{
void FadeInEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time )
{
if( windows.contains( w ))
{
windows[ w ] += time / 1000.; // complete change in 1000ms
if( windows[ w ] < 1 )
{
*mask |= Scene::PAINT_WINDOW_TRANSLUCENT;
*mask &= ~Scene::PAINT_WINDOW_OPAQUE;
}
else
windows.remove( w );
}
effects->prePaintWindow( w, mask, region, time );
}
void FadeInEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
{
if( windows.contains( w ))
{
data.opacity *= windows[ w ];
}
effects->paintWindow( w, mask, region, data );
}
void FadeInEffect::postPaintWindow( EffectWindow* w )
{
if( windows.contains( w ))
w->window()->addRepaintFull(); // trigger next animation repaint
effects->postPaintWindow( w );
}
void FadeInEffect::windowAdded( EffectWindow* c )
{
Client* cc = dynamic_cast< Client* >( c->window());
if( cc == NULL || cc->isOnCurrentDesktop())
{
windows[ c ] = 0;
c->window()->addRepaintFull();
}
}
void FadeInEffect::windowClosed( EffectWindow* c )
{
windows.remove( c );
}
} // namespace

35
effects/fadein.h
Unescape Escape View File

@ -1,35 +0,0 @@
/*****************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
#ifndef KWIN_FADEIN_H
#define KWIN_FADEIN_H
#include <effects.h>
namespace KWinInternal
{
class FadeInEffect
: public Effect
{
public:
virtual void prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time );
virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
virtual void postPaintWindow( EffectWindow* w );
// TODO react also on virtual desktop changes
virtual void windowAdded( EffectWindow* c );
virtual void windowClosed( EffectWindow* c );
private:
QMap< const EffectWindow*, double > windows;
};
} // namespace
#endif

71
effects/fadeout.cpp
Unescape Escape View File

@ -1,71 +0,0 @@
/*****************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
#include "fadeout.h"
#include <client.h>
#include <deleted.h>
namespace KWinInternal
{
void FadeOutEffect::prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time )
{
if( windows.contains( w ))
{
windows[ w ] -= time / 1000.; // complete change in 1000ms
if( windows[ w ] > 0 )
{
*mask |= Scene::PAINT_WINDOW_TRANSLUCENT;
*mask &= ~Scene::PAINT_WINDOW_OPAQUE;
w->enablePainting( Scene::Window::PAINT_DISABLED_BY_DELETE );
}
else
{
windows.remove( w );
static_cast< Deleted* >( w->window())->unrefWindow();
}
}
effects->prePaintWindow( w, mask, region, time );
}
void FadeOutEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
{
if( windows.contains( w ))
{
data.opacity *= windows[ w ];
}
effects->paintWindow( w, mask, region, data );
}
void FadeOutEffect::postPaintWindow( EffectWindow* w )
{
if( windows.contains( w ))
w->window()->addRepaintFull(); // trigger next animation repaint
effects->postPaintWindow( w );
}
void FadeOutEffect::windowClosed( EffectWindow* c )
{
Client* cc = dynamic_cast< Client* >( c->window());
if( cc == NULL || cc->isOnCurrentDesktop())
{
windows[ c ] = 1; // count down to 0
c->window()->addRepaintFull();
static_cast< Deleted* >( c->window())->refWindow();
}
}
void FadeOutEffect::windowDeleted( EffectWindow* c )
{
windows.remove( c );
}
} // namespace

35
effects/fadeout.h
Unescape Escape View File

@ -1,35 +0,0 @@
/*****************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2006 Lubos Lunak <l.lunak@kde.org>
You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
#ifndef KWIN_FADEOUT_H
#define KWIN_FADEOUT_H
#include <effects.h>
namespace KWinInternal
{
class FadeOutEffect
: public Effect
{
public:
virtual void prePaintWindow( EffectWindow* w, int* mask, QRegion* region, int time );
virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
virtual void postPaintWindow( EffectWindow* w );
// TODO react also on virtual desktop changes
virtual void windowClosed( EffectWindow* c );
virtual void windowDeleted( EffectWindow* c );
private:
QMap< const EffectWindow*, double > windows;
};
} // namespace
#endif
Write Preview
Loading…
Cancel
Save