From 933e7e2fdd9490b84b2140fe0478de9700e1847e Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Sun, 12 Jun 2016 08:36:03 +0200 Subject: [PATCH] Fixed maxWidth/maxHeight animation for menu items. The problem was that menus animated the scaled width/height rather than the real width/height, which caused their internal state to become corrupted, which showed when the item was then animated using maxWidth/maxHeight. --- RetroFE/Source/Graphics/Component/ScrollingList.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp index 3d7033f..05df980 100644 --- a/RetroFE/Source/Graphics/Component/ScrollingList.cpp +++ b/RetroFE/Source/Graphics/Component/ScrollingList.cpp @@ -556,8 +556,8 @@ void ScrollingList::resetTweens(Component *c, AnimationEvents *sets, ViewInfo *c c->baseViewInfo = *currentViewInfo; TweenSet *set = new TweenSet(); - set->push(new Tween(TWEEN_PROPERTY_HEIGHT, EASE_INOUT_QUADRATIC, currentViewInfo->ScaledHeight(), nextViewInfo->ScaledHeight(), scrollTime)); - set->push(new Tween(TWEEN_PROPERTY_WIDTH, EASE_INOUT_QUADRATIC, currentViewInfo->ScaledWidth(), nextViewInfo->ScaledWidth(), scrollTime)); + set->push(new Tween(TWEEN_PROPERTY_HEIGHT, EASE_INOUT_QUADRATIC, currentViewInfo->Height, nextViewInfo->Height, scrollTime)); + set->push(new Tween(TWEEN_PROPERTY_WIDTH, EASE_INOUT_QUADRATIC, currentViewInfo->Width, nextViewInfo->Width, scrollTime)); set->push(new Tween(TWEEN_PROPERTY_ANGLE, EASE_INOUT_QUADRATIC, currentViewInfo->Angle, nextViewInfo->Angle, scrollTime)); set->push(new Tween(TWEEN_PROPERTY_ALPHA, EASE_INOUT_QUADRATIC, currentViewInfo->Alpha, nextViewInfo->Alpha, scrollTime)); set->push(new Tween(TWEEN_PROPERTY_X, EASE_INOUT_QUADRATIC, currentViewInfo->X, nextViewInfo->X, scrollTime));