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

rename EffectsHandler::provideResizeEffect to singular, honor rules (also affecting the sync timer now)

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1123660
This commit is contained in:
Thomas Lübking 2010-05-06 14:54:34 +00:00
parent f7c3b38402
commit ffa8b5306c
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects.cpp
View file

@ -213,7 +213,7 @@ void EffectsHandlerImpl::postPaintWindow( EffectWindow* w )
// no special final code
}
bool EffectsHandlerImpl::provideResizeEffect()
bool EffectsHandlerImpl::providesResizeEffect()
{
for( int i = 0; i < loaded_effects.size(); ++i )
if( loaded_effects.at(i).second->isResizeEffect() )

2
effects.h
View file

@ -47,7 +47,7 @@ class EffectsHandlerImpl : public EffectsHandler
virtual void paintWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );
virtual void postPaintWindow( EffectWindow* w );
bool provideResizeEffect();
bool providesResizeEffect();
virtual void drawWindow( EffectWindow* w, int mask, QRegion region, WindowPaintData& data );

10
geometry.cpp
View file

@ -2660,7 +2660,7 @@ void Client::clearbound()
void Client::doDrawbound( const QRect& geom, bool clear )
{
if( effects && static_cast<EffectsHandlerImpl*>(effects)->provideResizeEffect() )
if( effects && static_cast<EffectsHandlerImpl*>(effects)->providesResizeEffect() )
return; // done by effect
if( decoration != NULL && decoration->drawbound( geom, clear ) )
return; // done by decoration
@ -3281,11 +3281,11 @@ void Client::performMoveResize()
bool transparent = false;
if( isResize() )
{
haveResizeEffect = effects && static_cast<EffectsHandlerImpl*>(effects)->provideResizeEffect();
transparent = haveResizeEffect || options->resizeMode == Options::Transparent;
haveResizeEffect = effects && static_cast<EffectsHandlerImpl*>(effects)->providesResizeEffect();
transparent = haveResizeEffect || rules()->checkMoveResizeMode( options->resizeMode) != Options::Opaque;
}
else
transparent = options->moveMode == Options::Transparent;
else if ( isMove())
transparent = rules()->checkMoveResizeMode( options->moveMode) != Options::Opaque;
#ifdef HAVE_XSYNC
if( isResize() && !transparent && sync_counter != None && !sync_resize_pending )