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

Merge branch 'master' into features/drawer

This commit is contained in:
Uwe Rathmann 2023-11-06 09:20:33 +01:00
parent 8248ecdd90 e2432e4f0c
commit fb2754ee49
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/controls/QskPopup.cpp
View File

@ -76,9 +76,17 @@ static bool qskReplayMousePress()
return false; return false;
} }
static inline QskAspect qskEffectiveFadingAspect( const QskPopup* popup )
{
auto aspect = popup->fadingAspect();
aspect.setSubcontrol( popup->effectiveSubcontrol( aspect.subControl() ) );
return aspect;
}
static void qskStartFading( QskPopup* popup, bool on ) static void qskStartFading( QskPopup* popup, bool on )
{ {
const auto aspect = popup->fadingAspect(); const auto aspect = qskEffectiveFadingAspect( popup );
auto hint = popup->animationHint( aspect ); auto hint = popup->animationHint( aspect );
@ -266,12 +274,14 @@ QskAspect QskPopup::fadingAspect() const
bool QskPopup::isFading() const bool QskPopup::isFading() const
{ {
return runningHintAnimator( fadingAspect() ) != nullptr; const auto aspect = qskEffectiveFadingAspect( this );
return runningHintAnimator( aspect ) != nullptr;
} }
qreal QskPopup::fadingFactor() const qreal QskPopup::fadingFactor() const
{ {
if ( auto animator = runningHintAnimator( fadingAspect() ) ) const auto aspect = qskEffectiveFadingAspect( this );
if ( auto animator = runningHintAnimator( aspect ) )
return animator->currentValue().value< qreal >(); return animator->currentValue().value< qreal >();
return isOpen() ? 1.0 : 0.0; return isOpen() ? 1.0 : 0.0;
@ -337,7 +347,7 @@ bool QskPopup::isTransitionAccepted( QskAspect aspect ) const
if ( ( aspect.value() == 0 ) ) if ( ( aspect.value() == 0 ) )
return true; return true;
if ( aspect.subControl() == effectiveSubcontrol( fadingAspect().subControl() ) ) if ( aspect.subControl() == qskEffectiveFadingAspect( this ).subControl() )
return true; return true;
if ( aspect.subControl() == effectiveSubcontrol( QskPopup::Overlay ) ) if ( aspect.subControl() == effectiveSubcontrol( QskPopup::Overlay ) )
@ -488,7 +498,7 @@ bool QskPopup::event( QEvent* event )
const auto animatorEvent = static_cast< QskAnimatorEvent* >( event ); const auto animatorEvent = static_cast< QskAnimatorEvent* >( event );
if ( ( animatorEvent->state() == QskAnimatorEvent::Terminated ) if ( ( animatorEvent->state() == QskAnimatorEvent::Terminated )
&& ( animatorEvent->aspect() == fadingAspect() ) ) && ( animatorEvent->aspect() == qskEffectiveFadingAspect( this ) ) )
{ {
if ( !isOpen() ) if ( !isOpen() )
{ {