Skip to content

Commit

Permalink
[NUI] Fix Navigator to support Page with Transitions
Browse files Browse the repository at this point in the history
Previously, PushWithTransition and PopWithTransition did not support
Page. It supported either ContentPage or DialogPage.

Now, PushWithTransition and PopWithTransition supports Page as well.
  • Loading branch information
Jaehyun-Cho authored and tscholb committed Dec 27, 2023
1 parent 1056eae commit 9234bba
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions src/Tizen.NUI.Components/Controls/Navigation/Navigator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,16 @@ private TransitionSet CreateTransitions(Page currentTopPage, Page newTopPage, bo

if (!pushTransition || newTopPage is DialogPage == false)
{
View transitionView = (currentTopPage is ContentPage) ? (currentTopPage as ContentPage).Content : (currentTopPage as DialogPage).Content;
View transitionView = currentTopPage;
if (currentTopPage is ContentPage)
{
transitionView = (currentTopPage as ContentPage).Content;
}
else if (currentTopPage is DialogPage)
{
transitionView = (currentTopPage as DialogPage).Content;
}

if (currentTopPage.DisappearingTransition != null && transitionView != null)
{
TransitionItemBase disappearingTransition = currentTopPage.DisappearingTransition.CreateTransition(transitionView, false);
Expand All @@ -1012,7 +1021,16 @@ private TransitionSet CreateTransitions(Page currentTopPage, Page newTopPage, bo
}
if (pushTransition || currentTopPage is DialogPage == false)
{
View transitionView = (newTopPage is ContentPage) ? (newTopPage as ContentPage).Content : (newTopPage as DialogPage).Content;
View transitionView = newTopPage;
if (newTopPage is ContentPage)
{
transitionView = (newTopPage as ContentPage).Content;
}
else if (newTopPage is DialogPage)
{
transitionView = (newTopPage as DialogPage).Content;
}

if (newTopPage.AppearingTransition != null && transitionView != null)
{
TransitionItemBase appearingTransition = newTopPage.AppearingTransition.CreateTransition(transitionView, true);
Expand Down

0 comments on commit 9234bba

Please sign in to comment.