peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong handling of terminations of unrelated animators fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2019-02-05 15:09:00 +01:00
parent 646e670ee4
commit e738c9ec89
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/controls/QskSkinTransition.cpp
View File

@ -179,6 +179,25 @@ namespace
it.second.start();
}
bool isRunning() const
{
if ( !m_hintAnimatorMap.empty() )
{
const auto& animator = m_hintAnimatorMap.begin()->second;
if ( animator.isRunning() )
return true;
}
if ( !m_graphicFilterAnimatorMap.empty() )
{
const auto& animator = m_graphicFilterAnimatorMap.begin()->second;
if ( animator.isRunning() )
return true;
}
return false;
}
inline QVariant animatedHint( QskAspect::Aspect aspect ) const
{
auto it = m_hintAnimatorMap.find( aspect );
@ -470,8 +489,13 @@ namespace
auto group = *it;
if ( group->window() == window )
{
m_animatorGroups.erase( it );
delete group;
if ( !group->isRunning() )
{
// The notification might be for other animators
m_animatorGroups.erase( it );
delete group;
}
break;
}