Skip to content

Remove ElementAnimator and related WINUI_PRERELEASE code #1733

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

Merged
karkarl merged 1 commit into from
Jan 29, 2025
Merged

Remove ElementAnimator and related WINUI_PRERELEASE code #1733

Show file tree
Hide file tree
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
128 changes: 0 additions & 128 deletions WinUIGallery/Common/DefaultElementAnimator.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions WinUIGallery/ControlPages/ItemsRepeaterPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,6 @@ private void InitializeData()
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,0,0,20"
TextChanged="FilterRecipes_FilterChanged"/>
<TextBlock>Enable Animations</TextBlock>
<CheckBox Content="Enable animations" x:Name="EnableAnimations" Checked="OnEnableAnimationsChanged"
Unchecked="OnEnableAnimationsChanged" Margin="0,0,0,10"/>
<TextBlock Text="Sort by number of ingredients" Margin="0,0,0,10"/>
<Button Content="Least to most" Click="OnSortAscClick" Margin="0,0,0,5"/>
<Button Content="Most to least" Click="OnSortDesClick"/>
Expand Down
6 changes: 0 additions & 6 deletions WinUIGallery/ControlPages/ItemsRepeaterPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,6 @@ private List<Recipe> GetRecipeList()

return tempList;
}
private void OnEnableAnimationsChanged(object sender, RoutedEventArgs e)
{
#if WINUI_PRERELEASE
VariedImageSizeRepeater.Animator = EnableAnimations.IsChecked.GetValueOrDefault() ? new DefaultElementAnimator() : null;
#endif
}

public void FilterRecipes_FilterChanged(object sender, RoutedEventArgs e)
{
Expand Down
8 changes: 0 additions & 8 deletions WinUIGallery/ControlPagesSampleCode/ItemsRepeater/ItemsRepeaterSample4_cs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,6 @@ private void InitializeData()
}

// ========================== Filtering, sorting, animating ==========================
private void OnEnableAnimationsChanged(object sender, RoutedEventArgs e)
{
// This function calls a custom animator called DefaultElementAnimator.
// See the WinUI Gallery source code for full implementation in DefaultElementAnimator.cs
VariedImageSizeRepeater.Animator = EnableAnimations.IsChecked.GetValueOrDefault()
? new DefaultElementAnimator() : null;
}

public void FilterRecipes_FilterChanged(object sender, RoutedEventArgs e)
{
UpdateSortAndFilter();
Expand Down
2 changes: 0 additions & 2 deletions WinUIGallery/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<!-- We have two projects in the same directory here, so we'll add a differentiator folder to output directories. -->
<GenerateProjectSpecificOutputFolder>true</GenerateProjectSpecificOutputFolder>
<!-- Work around DefaultElementAnimator.cs compiler error from missing experimental types -->
<MUXFinalRelease>true</MUXFinalRelease>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')))" />
Expand Down