diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-04 16:42:10 +0000 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-12-06 00:16:44 +0100 |
| commit | d6b1e268796aac1448f8fe6a153d4aa129466c76 (patch) | |
| tree | d7d8e41adc3a9d9db9c8e718913919c3964ecb49 /slideshow | |
| parent | 8f237e07a08abf703e0da15030bd708fde28e616 (diff) | |
tdf#121830 TogglePause should reset to original state on deactivate_st ?
is that how it should work, or should there be an additional TogglePause
created at import time to get the apparent intended pause effect
Change-Id: I0573bd8d9534271f2b36d7ab3b8cdc20e0f985a1
Reviewed-on: https://gerrit.libreoffice.org/64548
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 1aa10fcb668f67f4313b7170a4090027e52164c5)
Reviewed-on: https://gerrit.libreoffice.org/64620
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationcommandnode.cxx | 19 | ||||
| -rw-r--r-- | slideshow/source/engine/animationnodes/animationcommandnode.hxx | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx index 0c9519589ed0..3bd05db936b2 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx @@ -109,6 +109,25 @@ void AnimationCommandNode::activate_st() "AnimationCommandNode::deactivate" ) ); } +void AnimationCommandNode::deactivate_st( NodeState /*eDestState*/ ) +{ + switch( mxCommandNode->getCommand() ) { + // the command toggles the pause status on a media object + case EffectCommands::TOGGLEPAUSE: + { + if( mpShape ) + { + if( mpShape->isPlaying() ) + mpShape->pause(); + else + mpShape->play(); + } + break; + } + + } +} + bool AnimationCommandNode::hasPendingAnimation() const { return mxCommandNode->getCommand() == EffectCommands::STOPAUDIO || mpShape; diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx index 675da7c3b0e8..cf753e001949 100644 --- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx +++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx @@ -46,6 +46,7 @@ protected: private: virtual void activate_st() override; + virtual void deactivate_st( NodeState eDestState ) override; virtual bool hasPendingAnimation() const override; private: |