From 0b16afac6d9487a93e398f665099e53ead404e25 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Mon, 7 Dec 2020 22:28:05 +0800
Subject: [PATCH] fixed #544

---
 .../Themes/Styles/Base/ShieldBaseStyle.xaml        | 14 ++++----------
 src/Shared/HandyControl_Shared/Themes/Theme.xaml   | 11 ++---------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
index 9be8e9c9..6b2e7f73 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ShieldBaseStyle.xaml
@@ -5,6 +5,7 @@
 
     <ResourceDictionary.MergedDictionaries>
         <themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Styles/Base/BaseStyle.xaml" />
+        <themes:SharedResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Basic/Converters.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Shield">
@@ -22,17 +23,10 @@
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <Grid.OpacityMask>
-                            <VisualBrush Stretch="None">
-                                <VisualBrush.Visual>
-                                    <Border x:Name="clipMask" Background="White" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
-                                </VisualBrush.Visual>
-                            </VisualBrush>
-                        </Grid.OpacityMask>
-                        <Border Grid.Column="0" Background="#555">
+                        <Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
                             <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0"/>
                         </Border>
-                        <Border Grid.Column="1" Background="{TemplateBinding Color}">
+                        <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}"/>
                         </Border>
                     </Grid>
@@ -41,4 +35,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index d5b5dadc..1424f439 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -9732,17 +9732,10 @@
               <ColumnDefinition Width="Auto" />
               <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <Grid.OpacityMask>
-              <VisualBrush Stretch="None">
-                <VisualBrush.Visual>
-                  <Border x:Name="clipMask" Background="White" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-                </VisualBrush.Visual>
-              </VisualBrush>
-            </Grid.OpacityMask>
-            <Border Grid.Column="0" Background="#555">
+            <Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
               <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
             </Border>
-            <Border Grid.Column="1" Background="{TemplateBinding Color}">
+            <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}" />
             </Border>
           </Grid>