Skip to content

Commit 4bba83e

Browse files
StefanoRivolta-PrevieroStefanoRivolta-Previero
authored
Fix border in buttons with progressbar (#2509)
1 parent 7dbff29 commit 4bba83e

File tree

1 file changed

+32
-28
lines changed

1 file changed

+32
-28
lines changed

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

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@
182182
<Grid>
183183
<Border Background="{TemplateBinding Background}" x:Name="border"
184184
CornerRadius="{Binding Path=(wpf:ButtonAssist.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
185-
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
186-
<ProgressBar x:Name="ProgressBar"
185+
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
186+
<ProgressBar x:Name="ProgressBar"
187187
Style="{DynamicResource MaterialDesignLinearProgressBar}"
188188
Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
189189
Maximum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Maximum)}"
@@ -198,16 +198,16 @@
198198
Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
199199
HorizontalAlignment="Left"
200200
VerticalAlignment="Center">
201-
<ProgressBar.Clip>
202-
<MultiBinding Converter="{StaticResource BorderClipConverter}">
203-
<Binding ElementName="border" Path="ActualWidth" />
204-
<Binding ElementName="border" Path="ActualHeight" />
205-
<Binding ElementName="border" Path="CornerRadius" />
206-
<Binding ElementName="border" Path="BorderThickness" />
207-
</MultiBinding>
208-
</ProgressBar.Clip>
209-
</ProgressBar>
210-
</Border>
201+
<ProgressBar.Clip>
202+
<MultiBinding Converter="{StaticResource BorderClipConverter}">
203+
<Binding ElementName="border" Path="ActualWidth" />
204+
<Binding ElementName="border" Path="ActualHeight" />
205+
<Binding ElementName="border" Path="CornerRadius" />
206+
<Binding ElementName="border" Path="BorderThickness" />
207+
</MultiBinding>
208+
</ProgressBar.Clip>
209+
</ProgressBar>
210+
211211
<wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
212212
ContentStringFormat="{TemplateBinding ContentStringFormat}"
213213
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -253,14 +253,16 @@
253253
<Style x:Key="MaterialDesignFlatSecondaryButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignFlatButton}">
254254
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidBrush}"/>
255255
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueMidBrush}"/>
256+
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
257+
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource SecondaryHueMidBrush}" />
256258
</Style>
257259

258-
<Style x:Key="MaterialDesignFlatSecondaryLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignFlatButton}">
260+
<Style x:Key="MaterialDesignFlatSecondaryLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignFlatSecondaryButton}">
259261
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueLightBrush}"/>
260262
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueLightBrush}"/>
261263
</Style>
262264

263-
<Style x:Key="MaterialDesignFlatSecondaryDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignFlatButton}">
265+
<Style x:Key="MaterialDesignFlatSecondaryDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignFlatSecondaryButton}">
264266
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueDarkBrush}"/>
265267
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueDarkBrush}"/>
266268
</Style>
@@ -313,8 +315,8 @@
313315
x:Name="border"
314316
CornerRadius="{Binding Path=(wpf:ButtonAssist.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
315317
BorderBrush="{TemplateBinding BorderBrush}"
316-
BorderThickness="{TemplateBinding BorderThickness}">
317-
<ProgressBar x:Name="ProgressBar"
318+
BorderThickness="{TemplateBinding BorderThickness}"/>
319+
<ProgressBar x:Name="ProgressBar"
318320
Style="{DynamicResource MaterialDesignLinearProgressBar}"
319321
Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Minimum)}"
320322
Maximum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Maximum)}"
@@ -329,16 +331,16 @@
329331
Opacity="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ButtonProgressAssist.Opacity)}"
330332
HorizontalAlignment="Left"
331333
VerticalAlignment="Center">
332-
<ProgressBar.Clip>
333-
<MultiBinding Converter="{StaticResource BorderClipConverter}">
334-
<Binding ElementName="border" Path="ActualWidth" />
335-
<Binding ElementName="border" Path="ActualHeight" />
336-
<Binding ElementName="border" Path="CornerRadius" />
337-
<Binding ElementName="border" Path="BorderThickness" />
338-
</MultiBinding>
339-
</ProgressBar.Clip>
340-
</ProgressBar>
341-
</Border>
334+
<ProgressBar.Clip>
335+
<MultiBinding Converter="{StaticResource BorderClipConverter}">
336+
<Binding ElementName="border" Path="ActualWidth" />
337+
<Binding ElementName="border" Path="ActualHeight" />
338+
<Binding ElementName="border" Path="CornerRadius" />
339+
<Binding ElementName="border" Path="BorderThickness" />
340+
</MultiBinding>
341+
</ProgressBar.Clip>
342+
</ProgressBar>
343+
342344
<wpf:Ripple Content="{TemplateBinding Content}"
343345
ContentTemplate="{TemplateBinding ContentTemplate}"
344346
Focusable="False"
@@ -390,15 +392,17 @@
390392
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueMidBrush}"/>
391393
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueMidBrush}"/>
392394
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueMidBrush}"/>
395+
<Setter Property="wpf:ButtonProgressAssist.IndicatorForeground" Value="{DynamicResource SecondaryHueMidForegroundBrush}" />
396+
<Setter Property="wpf:ButtonProgressAssist.IndicatorBackground" Value="{DynamicResource SecondaryHueMidBrush}" />
393397
</Style>
394398

395-
<Style x:Key="MaterialDesignOutlinedSecondaryLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignOutlinedButton}">
399+
<Style x:Key="MaterialDesignOutlinedSecondaryLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignOutlinedSecondaryButton}">
396400
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueLightBrush}"/>
397401
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueLightBrush}"/>
398402
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueLightBrush}"/>
399403
</Style>
400404

401-
<Style x:Key="MaterialDesignOutlinedSecondaryDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignOutlinedButton}">
405+
<Style x:Key="MaterialDesignOutlinedSecondaryDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignOutlinedSecondaryButton}">
402406
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryHueDarkBrush}" />
403407
<Setter Property="Foreground" Value="{DynamicResource SecondaryHueDarkBrush}" />
404408
<Setter Property="wpf:RippleAssist.Feedback" Value="{DynamicResource SecondaryHueDarkBrush}"/>

0 commit comments

Comments
 (0)