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

Don't explode all windows (i.e. also menues)

Browse source 
The window type doesn't seem to be accurate, i.e.
pretty much all windows are normal and special.
kickoff for example isn't a PopupMenu or something
that enables us to not animate it.

Well, at least this way tooltips and applicationmenues
do not explode anymore.

svn path=/trunk/KDE/kdebase/workspace/; revision=826321
This commit is contained in:
Sebastian Kügler 2008-06-30 12:52:06 +00:00
parent e0752e57d3
commit 48912dd264
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
effects/fallapart.cpp
View file

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "fallapart.h"
#include <kdebug.h>
#include <assert.h>
#include <math.h>
@ -37,7 +37,7 @@ void FallApartEffect::prePaintScreen( ScreenPrePaintData& data, int time )
void FallApartEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data, int time )
{
if( windows.contains( w ))
if( windows.contains( w ) && isRealWindow( w ))
{
if( windows[ w ] < 1 )
{
@ -58,7 +58,7 @@ void FallApartEffect::prePaintWindow( EffectWindow* w, WindowPrePaintData& data,
void FallApartEffect::paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data )
{
if( windows.contains( w ))
if( windows.contains( w ) && isRealWindow( w ) )
{
WindowQuadList new_quads;
int cnt = 0;
@ -119,8 +119,29 @@ void FallApartEffect::postPaintScreen()
effects->postPaintScreen();
}
bool FallApartEffect::isRealWindow( EffectWindow* w )
{
// TODO: isSpecialWindow is rather generic, maybe tell windowtypes separately?
/*
kDebug() << "--" << w->caption() << "--------------------------------";
kDebug() << "Tooltip:" << w->isTooltip();
kDebug() << "Toolbar:" << w->isToolbar();
kDebug() << "Desktop:" << w->isDesktop();
kDebug() << "Special:" << w->isSpecialWindow();
kDebug() << "TopMenu:" << w->isTopMenu();
kDebug() << "Notific:" << w->isNotification();
kDebug() << "Splash:" << w->isSplash();
kDebug() << "Normal:" << w->isNormalWindow();
*/
if ( !w->isNormalWindow() )
return false;
return true;
}
void FallApartEffect::windowClosed( EffectWindow* c )
{
if ( !isRealWindow( c ) )
return;
windows[ c ] = 0;
c->refWindow();
}

2
effects/fallapart.h
View file

@ -38,6 +38,8 @@ class FallApartEffect
virtual void windowDeleted( EffectWindow* c );
private:
QHash< const EffectWindow*, double > windows;
bool isRealWindow ( EffectWindow* w );
};
} // namespace