From e8e38f804633e76233728884110d6c6f45c7705b Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Thu, 14 Mar 2024 23:04:42 +0000
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4920

---
 ModernWpf/ProgressBar/ProgressBar.xaml     |  4 +--
 test/ModernWpfTestApp/ProgressBarPage.xaml | 31 +++++++++++-----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ModernWpf/ProgressBar/ProgressBar.xaml b/ModernWpf/ProgressBar/ProgressBar.xaml
index 46ff5903..6d8e0d4e 100644
--- a/ModernWpf/ProgressBar/ProgressBar.xaml
+++ b/ModernWpf/ProgressBar/ProgressBar.xaml
@@ -125,7 +125,7 @@
                                 <DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <DoubleAnimation Storyboard.TargetName="DeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator2" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
-                                <DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
+                                <DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <!--#endregion-->
                                 <DoubleAnimationUsingKeyFrames
                                     Storyboard.TargetName="IndeterminateProgressBarIndicator2"
@@ -159,7 +159,7 @@
                                 <DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <DoubleAnimation Storyboard.TargetName="DeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator2" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
-                                <DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
+                                <DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
                                 <!--#endregion-->
                                 <DoubleAnimationUsingKeyFrames
                                     Storyboard.TargetName="IndeterminateProgressBarIndicator2"
diff --git a/test/ModernWpfTestApp/ProgressBarPage.xaml b/test/ModernWpfTestApp/ProgressBarPage.xaml
index d39f9522..80530b70 100644
--- a/test/ModernWpfTestApp/ProgressBarPage.xaml
+++ b/test/ModernWpfTestApp/ProgressBarPage.xaml
@@ -27,12 +27,12 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Grid.ColumnSpan="3" Orientation="Horizontal">
+        <StackPanelEx Grid.ColumnSpan="3" Orientation="Horizontal" Spacing="8">
             <TextBlock Text="Sample Progressbar" Style="{ThemeResource StandardGroupHeader}"/>
             <controls:FontIcon Glyph="&#xF0AF;" Margin="4,0,40,3" FontSize="14" VerticalAlignment="Center"/>
             <ProgressBar
                 x:Name="TestWUXProgressBar"
-                Width="400"
+                Width="300"
                 VerticalAlignment="Center"
                 AutomationProperties.Name="TestWUXProgressBar"
                 Style="{StaticResource DefaultProgressBarStyle}"
@@ -40,14 +40,14 @@
                 IsIndeterminate="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"/>
             <controls:ProgressBar
                 x:Name="TestProgressBar"
-                Width="400"
+                Width="300"
                 VerticalAlignment="Center"
                 AutomationProperties.Name="TestProgressBar"
                 HorizontalAlignment="Left"
                 IsIndeterminate="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"
                 ShowPaused="{Binding IsChecked, ElementName=ShowPausedCheckBox, Mode=OneWay}"
                 ShowError="{Binding IsChecked, ElementName=ShowErrorCheckBox, Mode=OneWay}"/>
-        </StackPanel>
+        </StackPanelEx>
 
         <StackPanel Grid.Row="1">
             <StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}">
@@ -105,20 +105,19 @@
                 <CheckBox x:Name="ShowErrorCheckBox" AutomationProperties.Name="ShowErrorCheckBox"  Content="ShowError"/>
                 <CheckBox x:Name="ShowIsIndeterminateCheckBox" AutomationProperties.Name="ShowIsIndeterminateCheckBox" Content="IsIndeterminate"/>
             </StackPanelEx>
-
-            <StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}" Margin="0,16,0,0">
-                <TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}"/>
-                <Button x:Name="UpdateMinMaxButton" AutomationProperties.Name="UpdateMinMaxButton" Content="Update Min and Max" Click="UpdateMinMax_Click"/>
-                <Button x:Name="UpdateWidthButton" AutomationProperties.Name="UpdateWidthButton" Content="Update Width" Click="UpdateWidth_Click"/>
-                <Button x:Name="UpdateValueButton" AutomationProperties.Name="UpdateValueButton" Content="Update Value" Click="UpdateValue_Click"/>
-                <RepeatButton x:Name="ChangeValueButton" AutomationProperties.Name="ChangeValueButton" Content="Hold and Change Value" Click="ChangeValue_Click" />
-                <Button x:Name="UpdatePaddingButton" AutomationProperties.Name="UpdatePaddingButton" Content="Update Padding Left and Right" Click="UpdatePadding_Click"/>
-            </StackPanelEx>
-
         </StackPanel>
 
-        <StackPanelEx Grid.Column="1" Grid.Row="1" Margin="16,0,0,0"
-                    Style="{ThemeResource StandardGroupingStackPanel}">
+        <StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}" Grid.Row="1" Grid.Column="1" Margin="16,0,0,0">
+            <TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}"/>
+            <Button x:Name="UpdateMinMaxButton" AutomationProperties.Name="UpdateMinMaxButton" Content="Update Min and Max" Click="UpdateMinMax_Click"/>
+            <Button x:Name="UpdateWidthButton" AutomationProperties.Name="UpdateWidthButton" Content="Update Width" Click="UpdateWidth_Click"/>
+            <Button x:Name="UpdateValueButton" AutomationProperties.Name="UpdateValueButton" Content="Update Value" Click="UpdateValue_Click"/>
+            <RepeatButton x:Name="ChangeValueButton" AutomationProperties.Name="ChangeValueButton" Content="Hold and Change Value" Click="ChangeValue_Click" />
+            <Button x:Name="UpdatePaddingButton" AutomationProperties.Name="UpdatePaddingButton" Content="Update Padding Left and Right" Click="UpdatePadding_Click"/>
+        </StackPanelEx>
+
+        <StackPanelEx Grid.Column="2" Grid.Row="1" Margin="16,0,0,0"
+                      Style="{ThemeResource StandardGroupingStackPanel}">
             <TextBlock Text="Properties" Style="{ThemeResource StandardGroupHeader}"/>
 
             <TextBlock Text="Value" Margin="0, 20, 0, 0"/>