Skip to content

Commit

Permalink
Port microsoft/microsoft-ui-xaml#4920 (#663)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kinnara
Kinnara authored Mar 14, 2024
1 parent 9eb38ca commit d98c634
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 18 deletions.
4 changes: 2 additions & 2 deletions ModernWpf/ProgressBar/ProgressBar.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
31 changes: 15 additions & 16 deletions test/ModernWpfTestApp/ProgressBarPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
<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}"
HorizontalAlignment="Left"
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}">
Expand Down Expand Up @@ -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"/>
Expand Down

0 comments on commit d98c634

Please sign in to comment.