From 64d73ba67112efd23748c0b872a55826f4e8c048 Mon Sep 17 00:00:00 2001
From: cuiliang <cuiliang.bj@gmail.com>
Date: Sun, 13 Dec 2020 13:51:37 +0800
Subject: [PATCH 1/3] Fix #576

---
 src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
index 10a4b7e9..900d8f2c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
@@ -83,7 +83,7 @@
                                 </Grid.RowDefinitions>
                                 <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
                                 <ScrollViewer Grid.Column="1" Grid.Row="0">
-                                    <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                    <TextBlock Margin="10,32,10,10" MinHeight="30" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"/>
                                 </ScrollViewer>
                                 <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
                             </Grid>

From a8dacd6af213c9ecfe34c95ab17390977751ccb6 Mon Sep 17 00:00:00 2001
From: cuiliang <cuiliang.bj@gmail.com>
Date: Sun, 13 Dec 2020 22:29:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Fix=20#576=20=E8=A7=A3=E5=86=B3=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandyControl_Shared/Themes/Styles/MessageBox.xaml       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
index 900d8f2c..672a8d9e 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
@@ -82,8 +82,10 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
-                                <ScrollViewer Grid.Column="1" Grid.Row="0">
-                                    <TextBlock Margin="10,32,10,10" MinHeight="30" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                                <ScrollViewer Grid.Row="0" Grid.Column="1"  VerticalAlignment="Top" VerticalContentAlignment="Center">
+                                    <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
+                                        <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
+                                    </Border>
                                 </ScrollViewer>
                                 <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
                             </Grid>

From 02029fe95df4208a1c84fcf66c4373a10170f278 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 14 Jan 2021 23:33:22 +0800
Subject: [PATCH 3/3] update net4.0

---
 .../HandyControl_Net_40/Themes/Styles/MessageBox.xaml       | 6 ++++--
 .../HandyControl_Shared/Themes/Styles/MessageBox.xaml       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
index a907896e..2cf24acd 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml
@@ -83,8 +83,10 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
-                                <ScrollViewer Grid.Column="1" Grid.Row="0">
-                                    <TextBlock Margin="10,39,10,10" Text="{TemplateBinding Message}" TextWrapping="Wrap" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                                <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
+                                    <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
+                                        <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
+                                    </Border>
                                 </ScrollViewer>
                                 <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
                             </Grid>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
index 672a8d9e..c158b377 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml
@@ -82,7 +82,7 @@
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
                                 <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform"/>
-                                <ScrollViewer Grid.Row="0" Grid.Column="1"  VerticalAlignment="Top" VerticalContentAlignment="Center">
+                                <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
                                     <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
                                         <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
                                     </Border>
@@ -104,4 +104,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>