Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide ProgressBarTrack in IndeterminateError and IndeterminatePause #4920

Merged
merged 3 commits into from
May 3, 2021
Merged

Hide ProgressBarTrack in IndeterminateError and IndeterminatePause #4920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bc48ac
tweak testUI
karkarl Apr 28, 2021
f372452
hide track when indeterminate error/paused
karkarl Apr 28, 2021
1705d91
fix failing tests
karkarl Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/ProgressBar/ProgressBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<Setter Target="IndeterminateProgressBarIndicator.Opacity" Value="0" />
<Setter Target="DeterminateProgressBarIndicator.Opacity" Value="0" />
<Setter Target="IndeterminateProgressBarIndicator2.Opacity" Value="1" />
<Setter Target="ProgressBarTrack.Opacity" Value="1" />
<Setter Target="ProgressBarTrack.Opacity" Value="0" />
</VisualState.Setters>
<Storyboard>
<DoubleAnimationUsingKeyFrames
Expand Down Expand Up @@ -189,7 +189,7 @@
<Setter Target="IndeterminateProgressBarIndicator.Opacity" Value="0" />
<Setter Target="DeterminateProgressBarIndicator.Opacity" Value="0" />
<Setter Target="IndeterminateProgressBarIndicator2.Opacity" Value="1" />
<Setter Target="ProgressBarTrack.Opacity" Value="1" />
<Setter Target="ProgressBarTrack.Opacity" Value="0" />
</VisualState.Setters>
<Storyboard>
<DoubleAnimationUsingKeyFrames
Expand Down
30 changes: 15 additions & 15 deletions dev/ProgressBar/TestUI/ProgressBarPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
xmlns:local="using:MUXControlsTestApp"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:contract5Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 5)">

<Page.Resources>
<local:NullableBooleanToBooleanConverter x:Key="NullableBooleanToBooleanConverter" />
Expand All @@ -27,12 +28,12 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<StackPanel Grid.ColumnSpan="3" Orientation="Horizontal">
<StackPanel Grid.ColumnSpan="3" Orientation="Horizontal" contract5Present:Spacing="8">
<TextBlock Text="Sample Progressbar" Style="{ThemeResource StandardGroupHeader}"/>
<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}"
Expand All @@ -42,7 +43,7 @@
ShowError="{x:Bind ShowErrorCheckBox.IsChecked, Converter={StaticResource NullableBooleanToBooleanConverter}, Mode=OneWay}"/>
<controls:ProgressBar
x:Name="TestProgressBar"
Width="400"
Width="300"
VerticalAlignment="Center"
AutomationProperties.Name="TestProgressBar"
HorizontalAlignment="Left"
Expand Down Expand Up @@ -107,19 +108,18 @@
<CheckBox x:Name="ShowErrorCheckBox" AutomationProperties.Name="ShowErrorCheckBox" Content="ShowError"/>
<CheckBox x:Name="ShowIsIndeterminateCheckBox" AutomationProperties.Name="ShowIsIndeterminateCheckBox" Content="IsIndeterminate"/>
</StackPanel>
</StackPanel>

<StackPanel 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"/>
</StackPanel>

<StackPanel 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"/>
</StackPanel>

<StackPanel Grid.Column="1" Grid.Row="1" Margin="16,0,0,0"
<StackPanel Grid.Column="2" Grid.Row="1" Margin="16,0,0,0"
Style="{ThemeResource StandardGroupingStackPanel}">
<TextBlock Text="Properties" Style="{ThemeResource StandardGroupHeader}"/>

Expand Down