From 1ea223f34cc7dbb2247731037721d2de2cbf3fec Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Fri, 4 Jun 2010 16:59:09 +0000 Subject: [PATCH] added "unlockAnimations" method. svn path=/trunk/KDE/kdebase/workspace/; revision=1134598 --- clients/oxygen/oxygentitleanimationdata.cpp | 4 ++-- clients/oxygen/oxygentitleanimationdata.h | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/clients/oxygen/oxygentitleanimationdata.cpp b/clients/oxygen/oxygentitleanimationdata.cpp index 87b38c098e..2b0b7c4eb7 100644 --- a/clients/oxygen/oxygentitleanimationdata.cpp +++ b/clients/oxygen/oxygentitleanimationdata.cpp @@ -90,8 +90,8 @@ namespace Oxygen if( e->timerId() != animationLockTimer_.timerId() ) { return QObject::timerEvent( e ); } - // stop veto - animationLockTimer_.stop(); + // unlock + unlockAnimations(); if( !isAnimated() ) { diff --git a/clients/oxygen/oxygentitleanimationdata.h b/clients/oxygen/oxygentitleanimationdata.h index 928272212c..7645111486 100644 --- a/clients/oxygen/oxygentitleanimationdata.h +++ b/clients/oxygen/oxygentitleanimationdata.h @@ -95,7 +95,6 @@ namespace Oxygen //!@name animation //@{ - //! returns true if animations are locked bool isLocked( void ) const { return animationLockTimer_.isActive(); } @@ -108,6 +107,10 @@ namespace Oxygen void lockAnimations( void ) { animationLockTimer_.start( lockTime_, this ); } + //! start lock animation timer + void unlockAnimations( void ) + { animationLockTimer_.stop(); } + //! start title transition animation void startAnimation( void ) {