Skip to content

AnimateIn() fixes (#83) #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
E3245 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

AnimateIn() fixes (#83) #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions XComGame/Classes/UIPanel.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,15 +788,15 @@ simulated function RemoveTweens()
simulated function AnimateIn(optional float Delay = -1.0)
{
if( Delay == -1.0 && ParentPanel != none)
Delay = ParentPanel.GetChildIndex(self) * class'UIUtilities'.const.INTRO_ANIMATION_DELAY_PER_INDEX;
Delay = ParentPanel.GetDirectChildIndex(self) * class'UIUtilities'.const.INTRO_ANIMATION_DELAY_PER_INDEX; // HELIOS Issue #83 (WotC CHL Issue #341)

AddTweenBetween("_alpha", 0, Alpha, class'UIUtilities'.const.INTRO_ANIMATION_TIME, Delay);
}

simulated function AnimateOut(optional float Delay = -1.0)
{
if( Delay == -1.0 && ParentPanel != none )
Delay = ParentPanel.GetChildIndex(self) * class'UIUtilities'.const.INTRO_ANIMATION_DELAY_PER_INDEX;
Delay = ParentPanel.GetDirectChildIndex(self) * class'UIUtilities'.const.INTRO_ANIMATION_DELAY_PER_INDEX; // HELIOS Issue #83 (WotC CHL Issue #341)

AddTweenBetween("_alpha", Alpha, 0, class'UIUtilities'.const.INTRO_ANIMATION_TIME, Delay);
}
Expand Down Expand Up @@ -933,6 +933,31 @@ simulated function int GetChildIndex(UIPanel Child, optional bool ErrorIfNotFoun
return -1;
}

// Start HELIOS Issue #83 (WotC CHL Issue #341): Function to be used when actually getting the "direct" child index.
// UIScreens get all their recursive child panels added, so GetChildIndex is unusable for AnimateIn
simulated function int GetDirectChildIndex(UIPanel Child, optional bool ErrorIfNotFound = true)
{
local int i, index;

for(i = 0; i < ChildPanels.Length; ++i)
{
if( ChildPanels[i] == Child )
return index;

if (ChildPanels[i].ParentPanel == self)
index++;
}

// Don't print errors when recursing through children.
if( ErrorIfNotFound )
{
ScriptTrace();
`warn("UI ERROR: could not find Index of the child control '" $ Child.MCName $ "' in '" $ self.MCName $ "'.");
}
return -1;
}
// End HELIOS Issue #83 (WotC CHL Issue #341)

// TODO: Nativize
simulated function GetChildrenOfType(class ClassType, out array<UIPanel> ChildrenOfType)
{
Expand Down