Skip to content

Commit d98c634

Browse files
KinnaraKinnara
authored
1 parent 9eb38ca commit d98c634

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

‎ModernWpf/ProgressBar/ProgressBar.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
126126
<DoubleAnimation Storyboard.TargetName="DeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
127127
<DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator2" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
128-
<DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
128+
<DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
129129
<!--#endregion-->
130130
<DoubleAnimationUsingKeyFrames
131131
Storyboard.TargetName="IndeterminateProgressBarIndicator2"
@@ -159,7 +159,7 @@
159159
<DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
160160
<DoubleAnimation Storyboard.TargetName="DeterminateProgressBarIndicator" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
161161
<DoubleAnimation Storyboard.TargetName="IndeterminateProgressBarIndicator2" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
162-
<DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
162+
<DoubleAnimation Storyboard.TargetName="ProgressBarTrack" Storyboard.TargetProperty="Opacity" To="0" Duration="0" />
163163
<!--#endregion-->
164164
<DoubleAnimationUsingKeyFrames
165165
Storyboard.TargetName="IndeterminateProgressBarIndicator2"

‎test/ModernWpfTestApp/ProgressBarPage.xaml

+15-16
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
<RowDefinition Height="*"/>
2828
</Grid.RowDefinitions>
2929

30-
<StackPanel Grid.ColumnSpan="3" Orientation="Horizontal">
30+
<StackPanelEx Grid.ColumnSpan="3" Orientation="Horizontal" Spacing="8">
3131
<TextBlock Text="Sample Progressbar" Style="{ThemeResource StandardGroupHeader}"/>
3232
<controls:FontIcon Glyph="&#xF0AF;" Margin="4,0,40,3" FontSize="14" VerticalAlignment="Center"/>
3333
<ProgressBar
3434
x:Name="TestWUXProgressBar"
35-
Width="400"
35+
Width="300"
3636
VerticalAlignment="Center"
3737
AutomationProperties.Name="TestWUXProgressBar"
3838
Style="{StaticResource DefaultProgressBarStyle}"
3939
HorizontalAlignment="Left"
4040
IsIndeterminate="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"/>
4141
<controls:ProgressBar
4242
x:Name="TestProgressBar"
43-
Width="400"
43+
Width="300"
4444
VerticalAlignment="Center"
4545
AutomationProperties.Name="TestProgressBar"
4646
HorizontalAlignment="Left"
4747
IsIndeterminate="{x:Bind ShowIsIndeterminateCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"
4848
ShowPaused="{Binding IsChecked, ElementName=ShowPausedCheckBox, Mode=OneWay}"
4949
ShowError="{Binding IsChecked, ElementName=ShowErrorCheckBox, Mode=OneWay}"/>
50-
</StackPanel>
50+
</StackPanelEx>
5151

5252
<StackPanel Grid.Row="1">
5353
<StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}">
@@ -105,20 +105,19 @@
105105
<CheckBox x:Name="ShowErrorCheckBox" AutomationProperties.Name="ShowErrorCheckBox" Content="ShowError"/>
106106
<CheckBox x:Name="ShowIsIndeterminateCheckBox" AutomationProperties.Name="ShowIsIndeterminateCheckBox" Content="IsIndeterminate"/>
107107
</StackPanelEx>
108-
109-
<StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}" Margin="0,16,0,0">
110-
<TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}"/>
111-
<Button x:Name="UpdateMinMaxButton" AutomationProperties.Name="UpdateMinMaxButton" Content="Update Min and Max" Click="UpdateMinMax_Click"/>
112-
<Button x:Name="UpdateWidthButton" AutomationProperties.Name="UpdateWidthButton" Content="Update Width" Click="UpdateWidth_Click"/>
113-
<Button x:Name="UpdateValueButton" AutomationProperties.Name="UpdateValueButton" Content="Update Value" Click="UpdateValue_Click"/>
114-
<RepeatButton x:Name="ChangeValueButton" AutomationProperties.Name="ChangeValueButton" Content="Hold and Change Value" Click="ChangeValue_Click" />
115-
<Button x:Name="UpdatePaddingButton" AutomationProperties.Name="UpdatePaddingButton" Content="Update Padding Left and Right" Click="UpdatePadding_Click"/>
116-
</StackPanelEx>
117-
118108
</StackPanel>
119109

120-
<StackPanelEx Grid.Column="1" Grid.Row="1" Margin="16,0,0,0"
121-
Style="{ThemeResource StandardGroupingStackPanel}">
110+
<StackPanelEx Style="{ThemeResource StandardGroupingStackPanel}" Grid.Row="1" Grid.Column="1" Margin="16,0,0,0">
111+
<TextBlock Text="Actions" Style="{ThemeResource StandardGroupHeader}"/>
112+
<Button x:Name="UpdateMinMaxButton" AutomationProperties.Name="UpdateMinMaxButton" Content="Update Min and Max" Click="UpdateMinMax_Click"/>
113+
<Button x:Name="UpdateWidthButton" AutomationProperties.Name="UpdateWidthButton" Content="Update Width" Click="UpdateWidth_Click"/>
114+
<Button x:Name="UpdateValueButton" AutomationProperties.Name="UpdateValueButton" Content="Update Value" Click="UpdateValue_Click"/>
115+
<RepeatButton x:Name="ChangeValueButton" AutomationProperties.Name="ChangeValueButton" Content="Hold and Change Value" Click="ChangeValue_Click" />
116+
<Button x:Name="UpdatePaddingButton" AutomationProperties.Name="UpdatePaddingButton" Content="Update Padding Left and Right" Click="UpdatePadding_Click"/>
117+
</StackPanelEx>
118+
119+
<StackPanelEx Grid.Column="2" Grid.Row="1" Margin="16,0,0,0"
120+
Style="{ThemeResource StandardGroupingStackPanel}">
122121
<TextBlock Text="Properties" Style="{ThemeResource StandardGroupHeader}"/>
123122

124123
<TextBlock Text="Value" Margin="0, 20, 0, 0"/>

0 commit comments

Comments
 (0)