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

Show desktop in flip stack when desktop should be shown.

Browse source 
BUG: 260254

svn path=/trunk/KDE/kdebase/workspace/; revision=1207055
This commit is contained in:
Martin Gräßlin 2010-12-16 18:51:19 +00:00
parent ae7dc7e283
commit 1eea0dee70
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
effects/flipswitch/flipswitch.cpp
View file

@ -516,6 +516,12 @@ void FlipSwitchEffect::paintWindow( EffectWindow* w, int mask, QRegion region, W
if( w->isDesktop() ) if( w->isDesktop() )
{ {
// desktop is painted in normal way // desktop is painted in normal way
if( m_windows.contains( w ) )
{
m_windows[ w ]->opacity = data.opacity;
m_windows[ w ]->brightness = data.brightness;
m_windows[ w ]->saturation = data.saturation;
}
effects->paintWindow( w, mask, region, data ); effects->paintWindow( w, mask, region, data );
return; return;
} }
@ -811,8 +817,11 @@ bool FlipSwitchEffect::borderActivated(ElectricBorder border)
bool FlipSwitchEffect::isSelectableWindow( EffectWindow* w ) const bool FlipSwitchEffect::isSelectableWindow( EffectWindow* w ) const
{ {
if( w->isSpecialWindow() || w->isUtility() ) // desktop windows might be included
if( (w->isSpecialWindow() && !w->isDesktop()) || w->isUtility() )
return false; return false;
if( w->isDesktop() )
return (m_mode == TabboxMode && effects->currentTabBoxWindowList().contains( w ));
if( w->isDeleted() ) if( w->isDeleted() )
return false; return false;
if( !w->acceptsFocus() ) if( !w->acceptsFocus() )