From 14b2e977008330776de50db91eda263b7ef4b3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 24 Sep 2008 09:04:45 +0000 Subject: [PATCH] Ensure that full screen input window is always destroyed when using alt+tab again while flip switch closes. So mouse cursor is shown again. svn path=/trunk/KDE/kdebase/workspace/; revision=864231 --- effects/flipswitch.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/effects/flipswitch.cpp b/effects/flipswitch.cpp index e1ef1dfc0b..1a7c86118b 100644 --- a/effects/flipswitch.cpp +++ b/effects/flipswitch.cpp @@ -457,7 +457,6 @@ void FlipSwitchEffect::postPaintScreen() { addFullRepaint = false; effects->setActiveFullScreenEffect( 0 ); - effects->destroyInputWindow( input ); effects->addRepaintFull(); } effects->postPaintScreen(); @@ -489,11 +488,11 @@ void FlipSwitchEffect::tabBoxAdded( int mode ) if( !mActivated ) { // only for windows mode + input = effects->createFullScreenInputWindow( this, Qt::BlankCursor ); if( mode == TabBoxWindowsMode && effects->currentTabBoxWindowList().count() > 0 ) { effects->refTabBox(); effects->setActiveFullScreenEffect( this ); - input = effects->createFullScreenInputWindow( this, Qt::BlankCursor ); selectedWindow = effects->currentTabBoxWindowList().indexOf(effects->currentTabBoxWindow()); if( !stop && !stopRequested ) { @@ -525,6 +524,7 @@ void FlipSwitchEffect::tabBoxClosed() // if animation than deactivate after animation mActivated = false; effects->unrefTabBox(); + effects->destroyInputWindow( input ); if( mAnimation ) { if( start && rearrangeWindows == 0 ) @@ -543,8 +543,7 @@ void FlipSwitchEffect::tabBoxClosed() } else { - effects->setActiveFullScreenEffect( 0 ); - effects->destroyInputWindow( input ); + effects->setActiveFullScreenEffect( 0 ); } } }