Skip to content

Commit c3bb057

Browse files
authored
Merge pull request #4792 from unoplatform/dev/sb/determinate-progress-pr
Determinate ProgressRing: Address PR comments
2 parents dc7a22c + ba6e221 commit c3bb057

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

src/AddIns/Uno.UI.Lottie/ts/Uno.UI.Lottie.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ namespace Uno.UI {
6161
const fromFrame = fromProgress * Lottie._numberOfFrames;
6262
const toFrame = toProgress * Lottie._numberOfFrames;
6363

64+
//Set forceFlag to true in order to force animation to start right away
65+
//Ensures calling play multiple times in quick succession plays the animation properly
6466
a.playSegments([fromFrame, toFrame], true);
6567
Lottie.raiseState(a);
6668
});

src/Uno.UI/Uno.UI.Wasm.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@
146146
</ProjectReference>
147147
</ItemGroup>
148148

149-
<ItemGroup>
150-
<None Remove="Microsoft\UI\Xaml\Controls\ProgressRing\ProgressRingDeterminate.json" />
151-
</ItemGroup>
152-
153149
<Target Name="_UnoWasmOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
154150

155151
<PropertyGroup>

src/Uno.UI/Uno.UI.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,6 @@
174174
</ProjectReference>
175175
</ItemGroup>
176176

177-
<ItemGroup>
178-
<None Remove="Microsoft\UI\Xaml\Controls\ProgressRing\ProgressRingDeterminate.json" />
179-
</ItemGroup>
180-
181177
<ItemGroup>
182178
<Compile Include="Mixins\Android\BaseActivity.Callbacks.g.cs" />
183179
<Compile Include="Mixins\Android\FrameworkElementMixins.g.cs" />

0 commit comments

Comments
 (0)