From cbca152d48a08f7f205cc7774f1aa5f88f4f8baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 28 Aug 2010 08:43:12 +0000 Subject: [PATCH] Forward port rev 1169047: Block keyboard input during animations in desktop grid. This works around crashers if a key is pressed directly after activating the effect. Working around is not the perfect solution, but we already block mouse events, so it is consistent. And unfortunately the effect has become difficult to maintain and I fear it's like chasing one crash after the other if we allow user interaction during the animations. CCBUG: 244813 svn path=/trunk/KDE/kdebase/workspace/; revision=1169048 --- effects/desktopgrid/desktopgrid.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/effects/desktopgrid/desktopgrid.cpp b/effects/desktopgrid/desktopgrid.cpp index 335599f754..223785dc07 100644 --- a/effects/desktopgrid/desktopgrid.cpp +++ b/effects/desktopgrid/desktopgrid.cpp @@ -747,6 +747,8 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e ) void DesktopGridEffect::grabbedKeyboardEvent( QKeyEvent* e ) { + if( timeline.value() != 1 ) // Block user input during animations + return; if( e->type() == QEvent::KeyPress ) { // check for global shortcuts