Merge branch 'master' into develop

ghost1372 · Apr 7, 2021 · 084bda3 · 084bda3
2 parents 90d1c4b + 6802dee
commit 084bda3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
@@ -27,7 +27,7 @@
                             <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0"/>
                         </Border>
                         <Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}"/>
+                            <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}"/>
                         </Border>
                     </Grid>
                 </ControlTemplate>

diff --git a/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe b/src/Shared/HandyControl_Shared/Themes/XamlCombine.exe