diff --git a/effects.cpp b/effects.cpp index f32e2308f0..155d55afb7 100644 --- a/effects.cpp +++ b/effects.cpp @@ -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() ) diff --git a/effects.h b/effects.h index 89c55fe739..4eb8ac67a8 100644 --- a/effects.h +++ b/effects.h @@ -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 ); diff --git a/geometry.cpp b/geometry.cpp index 34ace6376d..b73bb5977a 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -2660,7 +2660,7 @@ void Client::clearbound() void Client::doDrawbound( const QRect& geom, bool clear ) { - if( effects && static_cast(effects)->provideResizeEffect() ) + if( effects && static_cast(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(effects)->provideResizeEffect(); - transparent = haveResizeEffect || options->resizeMode == Options::Transparent; + haveResizeEffect = effects && static_cast(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 )