Skip to content

Commit a042ce3

Browse files
committed
Fixed param name generation in ExpressionNode
Fixes #4011
1 parent 0c1fb1b commit a042ce3

File tree

7 files changed

+7
-6
lines changed

7 files changed

+7
-6
lines changed

Microsoft.Toolkit.Uwp.UI.Animations/Expressions/ExpressionNodes/ExpressionNode.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,10 @@ internal void EnsureReferenceInfo()
282282
}
283283

284284
// Create a map to store the generated paramNames for each CompObj
285-
uint id = 0;
286285
_compObjToParamNameMap = new Dictionary<CompositionObject, string>();
287286
foreach (var compObj in compObjects)
288287
{
289-
// compObj.ToString() will return something like "Windows.UI.Composition.SpriteVisual"
290-
// Make it look like "SpriteVisual_1"
291-
string paramName = compObj.ToString();
292-
paramName = $"{paramName.Substring(paramName.LastIndexOf('.') + 1)}_{++id}"; // make sure the created param name doesn't overwrite a custom name
288+
string paramName = Guid.NewGuid().ToUppercaseAsciiLetters();
293289

294290
_compObjToParamNameMap.Add(compObj, paramName);
295291
}

Microsoft.Toolkit.Uwp.UI.Media/Extensions/System/GuidExtensions.cs renamed to Microsoft.Toolkit.Uwp.UI.Animations/Extensions/System/GuidExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System;
66
using System.Diagnostics.Contracts;
77

8-
namespace Microsoft.Toolkit.Uwp.UI.Media
8+
namespace Microsoft.Toolkit.Uwp.UI.Animations
99
{
1010
/// <summary>
1111
/// An extension <see langword="class"/> for the <see cref="Guid"/> type

Microsoft.Toolkit.Uwp.UI.Media/Pipelines/PipelineBuilder.Effects.Internals.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Diagnostics.Contracts;
77
using System.Threading.Tasks;
88
using Microsoft.Graphics.Canvas.Effects;
9+
using Microsoft.Toolkit.Uwp.UI.Animations;
910
using Windows.Graphics.Effects;
1011
using Windows.UI;
1112
using Windows.UI.Composition;

Microsoft.Toolkit.Uwp.UI.Media/Pipelines/PipelineBuilder.Effects.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Linq;
99
using System.Threading.Tasks;
1010
using Microsoft.Graphics.Canvas.Effects;
11+
using Microsoft.Toolkit.Uwp.UI.Animations;
1112
using Windows.Graphics.Effects;
1213
using Windows.UI;
1314
using Windows.UI.Composition;

Microsoft.Toolkit.Uwp.UI.Media/Pipelines/PipelineBuilder.Initialization.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Threading.Tasks;
99
using Microsoft.Graphics.Canvas;
1010
using Microsoft.Graphics.Canvas.Effects;
11+
using Microsoft.Toolkit.Uwp.UI.Animations;
1112
using Microsoft.Toolkit.Uwp.UI.Media.Helpers;
1213
using Microsoft.Toolkit.Uwp.UI.Media.Helpers.Cache;
1314
using Windows.Graphics.Effects;

Microsoft.Toolkit.Uwp.UI.Media/Pipelines/PipelineBuilder.Merge.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.Linq;
99
using System.Threading.Tasks;
1010
using Microsoft.Graphics.Canvas.Effects;
11+
using Microsoft.Toolkit.Uwp.UI.Animations;
1112
using Windows.Graphics.Effects;
1213
using Windows.UI.Composition;
1314
using CanvasBlendEffect = Microsoft.Graphics.Canvas.Effects.BlendEffect;

Microsoft.Toolkit.Uwp.UI.Media/Pipelines/PipelineBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Collections.Generic;
77
using System.Diagnostics.Contracts;
88
using System.Threading.Tasks;
9+
using Microsoft.Toolkit.Uwp.UI.Animations;
910
using Windows.Graphics.Effects;
1011
using Windows.UI.Composition;
1112
using Windows.UI.Xaml;

0 commit comments

Comments
 (0)