Skip to content

🎨 Fix progress bar foreground and background color for outlined and flat buttons #2530

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

Merged
Keboo merged 1 commit into from
Dec 29, 2021
+162 −2
Merged

🎨 Fix progress bar foreground and background color for outlined and flat buttons #2530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
🎨 Fix progress bar foreground and background color for outlined and f… 
…lat buttons

Also includes these variants in the demo app. ref #2481 and #2509.
  • Loading branch information
@database64128
database64128 committed Dec 22, 2021
commit 3960c0653ae89650703a1108571d76f60d3fe4d7
80 changes: 80 additions & 0 deletions MainDemo.Wpf/Buttons.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,86 @@
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_outlined_7" Margin="8 0">
<Grid Width="124">
<!-- raised button with progress, useful to auto dismiss/accept something -->
<Button
Command="{Binding DismissCommand}"
Style="{StaticResource MaterialDesignOutlinedButton}"
HorizontalAlignment="Left"
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="DISMISS"/>
<materialDesign:PackIcon
Margin="4 .5 0 0"
Kind="Close" />
</StackPanel>
</Button>

<TextBlock
Text="{Binding DemoRestartCountdownText}"
VerticalAlignment="Center"
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_outlined_8" Margin="8 0">
<Grid Width="124">
<Button
Style="{StaticResource MaterialDesignOutlinedButton}"
materialDesign:ButtonProgressAssist.Value="-1"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
Content="Indeterminate" Margin="2,0"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_flat_bg_7" Margin="8 0">
<Grid Width="124">
<!-- raised button with progress, useful to auto dismiss/accept something -->
<Button
Command="{Binding DismissCommand}"
Style="{StaticResource MaterialDesignFlatButton}"
HorizontalAlignment="Left"
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="DISMISS"/>
<materialDesign:PackIcon
Margin="4 .5 0 0"
Kind="Close" />
</StackPanel>
</Button>

<TextBlock
Text="{Binding DemoRestartCountdownText}"
VerticalAlignment="Center"
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_flat_bg_8" Margin="8 0">
<Grid Width="124">
<Button
Style="{StaticResource MaterialDesignFlatButton}"
materialDesign:ButtonProgressAssist.Value="-1"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
Content="Indeterminate" Margin="2,0"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
</Grid>
</smtx:XamlDisplay>
</StackPanel>

<StackPanel
Orientation="Horizontal"
Margin="0 24 0 0">
<smtx:XamlDisplay UniqueKey="buttons_28" Margin="8 0">
<StackPanel Orientation="Horizontal" smtx:XamlDisplay.Ignore="This">
<!-- floating action button with progress -->
Expand Down
80 changes: 80 additions & 0 deletions MaterialDesign3.Demo.Wpf/Buttons.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,86 @@
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_outlined_7" Margin="8 0">
<Grid Width="124">
<!-- raised button with progress, useful to auto dismiss/accept something -->
<Button
Command="{Binding DismissCommand}"
Style="{StaticResource MaterialDesignOutlinedButton}"
HorizontalAlignment="Left"
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="DISMISS"/>
<materialDesign:PackIcon
Margin="4 .5 0 0"
Kind="Close" />
</StackPanel>
</Button>

<TextBlock
Text="{Binding DemoRestartCountdownText}"
VerticalAlignment="Center"
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_outlined_8" Margin="8 0">
<Grid Width="124">
<Button
Style="{StaticResource MaterialDesignOutlinedButton}"
materialDesign:ButtonProgressAssist.Value="-1"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
Content="Indeterminate" Margin="2,0"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_flat_bg_7" Margin="8 0">
<Grid Width="124">
<!-- raised button with progress, useful to auto dismiss/accept something -->
<Button
Command="{Binding DismissCommand}"
Style="{StaticResource MaterialDesignFlatButton}"
HorizontalAlignment="Left"
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="DISMISS"/>
<materialDesign:PackIcon
Margin="4 .5 0 0"
Kind="Close" />
</StackPanel>
</Button>

<TextBlock
Text="{Binding DemoRestartCountdownText}"
VerticalAlignment="Center"
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
</Grid>
</smtx:XamlDisplay>

<smtx:XamlDisplay UniqueKey="buttons_flat_bg_8" Margin="8 0">
<Grid Width="124">
<Button
Style="{StaticResource MaterialDesignFlatButton}"
materialDesign:ButtonProgressAssist.Value="-1"
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
Content="Indeterminate" Margin="2,0"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
</Grid>
</smtx:XamlDisplay>
</StackPanel>

<StackPanel
Orientation="Horizontal"
Margin="0 24 0 0">
<smtx:XamlDisplay UniqueKey="buttons_28" Margin="8 0">
<StackPanel Orientation="Horizontal" smtx:XamlDisplay.Ignore="This">
<!-- floating action button with progress -->
Expand Down
4 changes: 2 additions & 2 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@
<Setter Property="Height" Value="32" />
<Setter Property="wpf:ButtonAssist.CornerRadius" Value="2" />
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="Transparent" />
<Setter Property="wpf:ButtonProgressAssist.IsIndicatorVisible" Value="False" />
<Setter Property="wpf:ButtonProgressAssist.Opacity" Value=".4" />
<Setter Property="Template">
Expand Down