Skip to content

Commit c71f85f

Browse files
committed
improve demo
1 parent 7dda818 commit c71f85f

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

MainDemo.Wpf/Buttons.xaml

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,8 @@
241241
</Grid>
242242

243243
<!-- floating action button with progress -->
244-
<Button Style="{StaticResource MaterialDesignFloatingActionLightButton}" Margin="24 0 12 0"
244+
<TextBlock Margin="24 0 0 0" VerticalAlignment="Center">Click Me:</TextBlock>
245+
<Button Style="{StaticResource MaterialDesignFloatingActionLightButton}" Margin="8 0 0 0"
245246
Command="{Binding SaveComand}"
246247
materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding IsSaving}"
247248
materialDesign:ButtonProgressAssist.Value="{Binding SaveProgress}">
@@ -269,6 +270,29 @@
269270

270271
</Button>
271272

273+
<TextBlock Margin="24 0 0 0" VerticalAlignment="Center">Variations:</TextBlock>
274+
<Button Style="{StaticResource MaterialDesignFloatingActionButton}" Margin="16 0 0 0"
275+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
276+
materialDesign:ButtonProgressAssist.Value="-1"
277+
materialDesign:ButtonProgressAssist.IsIndeterminate="True"
278+
Content="{materialDesign:PackIcon DotsHorizontal}" />
279+
<Button Style="{StaticResource MaterialDesignFloatingActionAccentButton}" Margin="16 0 0 0"
280+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
281+
materialDesign:ButtonProgressAssist.Value="50"
282+
Content="{materialDesign:PackIcon DotsHorizontal}" />
283+
<Button Style="{StaticResource MaterialDesignFloatingActionButton}" Margin="16 0 0 0"
284+
Background="#81d4fa"
285+
BorderBrush="#81d4fa"
286+
Foreground="#DD000000"
287+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
288+
materialDesign:ButtonProgressAssist.Value="25"
289+
materialDesign:ButtonProgressAssist.IndicatorForeground="#e65100"
290+
materialDesign:ButtonProgressAssist.IndicatorBackground="#ffcc80"
291+
Content="{materialDesign:PackIcon DotsHorizontal}" />
292+
<Button Style="{StaticResource MaterialDesignFloatingActionMiniDarkButton}" Margin="16 0 0 0"
293+
materialDesign:ButtonProgressAssist.IsIndicatorVisible="True"
294+
materialDesign:ButtonProgressAssist.Value="75"
295+
Content="{materialDesign:PackIcon DotsHorizontal}" />
272296
</StackPanel>
273297
<Border Margin="0 16 0 0" BorderThickness="0 1 0 0" BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="7" />
274298

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<converters:RangeLengthConverter x:Key="RangeLengthConverter" />
2323
<converters:MathConverter x:Key="MathAddConverter" Operation="Add" />
24-
<system:Int32 x:Key="ProgressRingStrokeWidth">4</system:Int32>
24+
<system:Int32 x:Key="ProgressRingStrokeWidth">8</system:Int32>
2525

2626
<SolidColorBrush x:Key="AttentionToActionBrush" Color="{StaticResource MaterialDesignShadow}" Opacity=".23" po:Freeze="True" />
2727

@@ -210,7 +210,7 @@
210210
Background="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IndicatorBackground)}"
211211
Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Value)}"
212212
IsIndeterminate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.IsIndeterminate)}"
213-
Margin="-3"
213+
Margin="-8"
214214
Width="{TemplateBinding Width, Converter={StaticResource MathAddConverter}, ConverterParameter={StaticResource ProgressRingStrokeWidth}}"
215215
Height="{TemplateBinding Height, Converter={StaticResource MathAddConverter}, ConverterParameter={StaticResource ProgressRingStrokeWidth}}"
216216
HorizontalAlignment="Stretch"

0 commit comments

Comments
 (0)