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

Ensure that full screen input window is always destroyed when using alt+tab again while flip switch closes. So mouse cursor is shown again. Backport rev 864231.

Browse source 
svn path=/branches/KDE/4.1/kdebase/workspace/; revision=864234
This commit is contained in:
Martin Gräßlin 2008-09-24 09:06:18 +00:00
parent c2b678929e
commit 4f1a0d49d9
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
effects/flipswitch.cpp
View file

@ -457,7 +457,6 @@ void FlipSwitchEffect::postPaintScreen()
{ {
addFullRepaint = false; addFullRepaint = false;
effects->setActiveFullScreenEffect( 0 ); effects->setActiveFullScreenEffect( 0 );
effects->destroyInputWindow( input );
effects->addRepaintFull(); effects->addRepaintFull();
} }
effects->postPaintScreen(); effects->postPaintScreen();
@ -489,11 +488,11 @@ void FlipSwitchEffect::tabBoxAdded( int mode )
if( !mActivated ) if( !mActivated )
{ {
// only for windows mode // only for windows mode
input = effects->createFullScreenInputWindow( this, Qt::BlankCursor );
if( mode == TabBoxWindowsMode && effects->currentTabBoxWindowList().count() > 0 ) if( mode == TabBoxWindowsMode && effects->currentTabBoxWindowList().count() > 0 )
{ {
effects->refTabBox(); effects->refTabBox();
effects->setActiveFullScreenEffect( this ); effects->setActiveFullScreenEffect( this );
input = effects->createFullScreenInputWindow( this, Qt::BlankCursor );
selectedWindow = effects->currentTabBoxWindowList().indexOf(effects->currentTabBoxWindow()); selectedWindow = effects->currentTabBoxWindowList().indexOf(effects->currentTabBoxWindow());
if( !stop && !stopRequested ) if( !stop && !stopRequested )
{ {
@ -525,6 +524,7 @@ void FlipSwitchEffect::tabBoxClosed()
// if animation than deactivate after animation // if animation than deactivate after animation
mActivated = false; mActivated = false;
effects->unrefTabBox(); effects->unrefTabBox();
effects->destroyInputWindow( input );
if( mAnimation ) if( mAnimation )
{ {
if( start && rearrangeWindows == 0 ) if( start && rearrangeWindows == 0 )
@ -544,7 +544,6 @@ void FlipSwitchEffect::tabBoxClosed()
else else
{ {
effects->setActiveFullScreenEffect( 0 ); effects->setActiveFullScreenEffect( 0 );
effects->destroyInputWindow( input );
} }
} }
} }