Skip to content

Commit 42c475b

Browse files
database64128database64128
authored
🎨 Fix progress bar foreground and background color for outlined and flat buttons (#2530)
Also includes these variants in the demo app. ref #2481 and #2509.
1 parent b1c0642 commit 42c475b

File tree

3 files changed

+162
-2
lines changed

3 files changed

+162
-2
lines changed

‎MainDemo.Wpf/Buttons.xaml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,86 @@
729729
</Grid>
730730
</smtx:XamlDisplay>
731731

732+
<smtx:XamlDisplay UniqueKey="buttons_outlined_7" Margin="8 0">
733+
<Grid Width="124">
734+
<!-- raised button with progress, useful to auto dismiss/accept something -->
735+
<Button
736+
Command="{Binding DismissCommand}"
737+
Style="{StaticResource MaterialDesignOutlinedButton}"
738+
HorizontalAlignment="Left"
739+
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
740+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
741+
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
742+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
743+
<StackPanel Orientation="Horizontal">
744+
<TextBlock Text="DISMISS"/>
745+
<materialDesign:PackIcon
746+
Margin="4 .5 0 0"
747+
Kind="Close" />
748+
</StackPanel>
749+
</Button>
750+
751+
<TextBlock
752+
Text="{Binding DemoRestartCountdownText}"
753+
VerticalAlignment="Center"
754+
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
755+
</Grid>
756+
</smtx:XamlDisplay>
757+
758+
<smtx:XamlDisplay UniqueKey="buttons_outlined_8" Margin="8 0">
759+
<Grid Width="124">
760+
<Button
761+
Style="{StaticResource MaterialDesignOutlinedButton}"
762+
materialDesign:ButtonProgressAssist.Value="-1"
763+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
764+
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
765+
Content="Indeterminate" Margin="2,0"
766+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
767+
</Grid>
768+
</smtx:XamlDisplay>
769+
770+
<smtx:XamlDisplay UniqueKey="buttons_flat_bg_7" Margin="8 0">
771+
<Grid Width="124">
772+
<!-- raised button with progress, useful to auto dismiss/accept something -->
773+
<Button
774+
Command="{Binding DismissCommand}"
775+
Style="{StaticResource MaterialDesignFlatButton}"
776+
HorizontalAlignment="Left"
777+
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
778+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
779+
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
780+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
781+
<StackPanel Orientation="Horizontal">
782+
<TextBlock Text="DISMISS"/>
783+
<materialDesign:PackIcon
784+
Margin="4 .5 0 0"
785+
Kind="Close" />
786+
</StackPanel>
787+
</Button>
788+
789+
<TextBlock
790+
Text="{Binding DemoRestartCountdownText}"
791+
VerticalAlignment="Center"
792+
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
793+
</Grid>
794+
</smtx:XamlDisplay>
795+
796+
<smtx:XamlDisplay UniqueKey="buttons_flat_bg_8" Margin="8 0">
797+
<Grid Width="124">
798+
<Button
799+
Style="{StaticResource MaterialDesignFlatButton}"
800+
materialDesign:ButtonProgressAssist.Value="-1"
801+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
802+
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
803+
Content="Indeterminate" Margin="2,0"
804+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
805+
</Grid>
806+
</smtx:XamlDisplay>
807+
</StackPanel>
808+
809+
<StackPanel
810+
Orientation="Horizontal"
811+
Margin="0 24 0 0">
732812
<smtx:XamlDisplay UniqueKey="buttons_28" Margin="8 0">
733813
<StackPanel Orientation="Horizontal" smtx:XamlDisplay.Ignore="This">
734814
<!-- floating action button with progress -->

‎MaterialDesign3.Demo.Wpf/Buttons.xaml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,86 @@
729729
</Grid>
730730
</smtx:XamlDisplay>
731731

732+
<smtx:XamlDisplay UniqueKey="buttons_outlined_7" Margin="8 0">
733+
<Grid Width="124">
734+
<!-- raised button with progress, useful to auto dismiss/accept something -->
735+
<Button
736+
Command="{Binding DismissCommand}"
737+
Style="{StaticResource MaterialDesignOutlinedButton}"
738+
HorizontalAlignment="Left"
739+
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
740+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
741+
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
742+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
743+
<StackPanel Orientation="Horizontal">
744+
<TextBlock Text="DISMISS"/>
745+
<materialDesign:PackIcon
746+
Margin="4 .5 0 0"
747+
Kind="Close" />
748+
</StackPanel>
749+
</Button>
750+
751+
<TextBlock
752+
Text="{Binding DemoRestartCountdownText}"
753+
VerticalAlignment="Center"
754+
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
755+
</Grid>
756+
</smtx:XamlDisplay>
757+
758+
<smtx:XamlDisplay UniqueKey="buttons_outlined_8" Margin="8 0">
759+
<Grid Width="124">
760+
<Button
761+
Style="{StaticResource MaterialDesignOutlinedButton}"
762+
materialDesign:ButtonProgressAssist.Value="-1"
763+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
764+
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
765+
Content="Indeterminate" Margin="2,0"
766+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
767+
</Grid>
768+
</smtx:XamlDisplay>
769+
770+
<smtx:XamlDisplay UniqueKey="buttons_flat_bg_7" Margin="8 0">
771+
<Grid Width="124">
772+
<!-- raised button with progress, useful to auto dismiss/accept something -->
773+
<Button
774+
Command="{Binding DismissCommand}"
775+
Style="{StaticResource MaterialDesignFlatButton}"
776+
HorizontalAlignment="Left"
777+
materialDesign:ButtonProgressAssist.Value="{Binding DismissButtonProgress}"
778+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
779+
Visibility="{Binding ShowDismissButton, Converter={StaticResource BooleanToVisibilityConverter}}"
780+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}">
781+
<StackPanel Orientation="Horizontal">
782+
<TextBlock Text="DISMISS"/>
783+
<materialDesign:PackIcon
784+
Margin="4 .5 0 0"
785+
Kind="Close" />
786+
</StackPanel>
787+
</Button>
788+
789+
<TextBlock
790+
Text="{Binding DemoRestartCountdownText}"
791+
VerticalAlignment="Center"
792+
Visibility="{Binding ShowDismissButton, Converter={StaticResource InvertedBooleanToVisibilityConverter}}"/>
793+
</Grid>
794+
</smtx:XamlDisplay>
795+
796+
<smtx:XamlDisplay UniqueKey="buttons_flat_bg_8" Margin="8 0">
797+
<Grid Width="124">
798+
<Button
799+
Style="{StaticResource MaterialDesignFlatButton}"
800+
materialDesign:ButtonProgressAssist.Value="-1"
801+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
802+
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
803+
Content="Indeterminate" Margin="2,0"
804+
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
805+
</Grid>
806+
</smtx:XamlDisplay>
807+
</StackPanel>
808+
809+
<StackPanel
810+
Orientation="Horizontal"
811+
Margin="0 24 0 0">
732812
<smtx:XamlDisplay UniqueKey="buttons_28" Margin="8 0">
733813
<StackPanel Orientation="Horizontal" smtx:XamlDisplay.Ignore="This">
734814
<!-- floating action button with progress -->

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
<Setter Property="Height" Value="32" />
173173
<Setter Property="wpf:ButtonAssist.CornerRadius" Value="2" />
174174
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource PrimaryHueMidBrush}" />
175-
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidForegroundBrush}" />
176-
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource PrimaryHueMidBrush}" />
175+
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource PrimaryHueMidBrush}" />
176+
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="Transparent" />
177177
<Setter Property="wpf:ButtonProgressAssist.IsIndicatorVisible" Value="False" />
178178
<Setter Property="wpf:ButtonProgressAssist.Opacity" Value=".4" />
179179
<Setter Property="Template">

0 commit comments

Comments
 (0)