Skip to content

Commit 55e35e6

Browse files
NaBianNaBian
committed
fix: fixed #881 
1 parent 034238f commit 55e35e6

File tree

4 files changed

+76
-68
lines changed

4 files changed

+76
-68
lines changed

‎src/Net_40/HandyControl_Net_40/Themes/Styles/MessageBox.xaml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,25 @@
6868
<ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
6969
</Grid>
7070
</Grid>
71-
<Grid Grid.Row="1">
72-
<Grid.ColumnDefinitions>
73-
<ColumnDefinition Width="Auto"/>
74-
<ColumnDefinition/>
75-
</Grid.ColumnDefinitions>
76-
<Grid.RowDefinitions>
77-
<RowDefinition/>
78-
<RowDefinition Height="Auto"/>
79-
</Grid.RowDefinitions>
80-
<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"/>
81-
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
82-
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
83-
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
84-
</Border>
85-
</ScrollViewer>
86-
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
87-
</Grid>
71+
<AdornerDecorator Grid.Row="1">
72+
<Grid>
73+
<Grid.ColumnDefinitions>
74+
<ColumnDefinition Width="Auto"/>
75+
<ColumnDefinition/>
76+
</Grid.ColumnDefinitions>
77+
<Grid.RowDefinitions>
78+
<RowDefinition/>
79+
<RowDefinition Height="Auto"/>
80+
</Grid.RowDefinitions>
81+
<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"/>
82+
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
83+
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
84+
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
85+
</Border>
86+
</ScrollViewer>
87+
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
88+
</Grid>
89+
</AdornerDecorator>
8890
</Grid>
8991
</Border>
9092
<ControlTemplate.Triggers>

‎src/Net_40/HandyControl_Net_40/Themes/Theme.xaml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12707,23 +12707,25 @@
1270712707
<ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
1270812708
</Grid>
1270912709
</Grid>
12710-
<Grid Grid.Row="1">
12711-
<Grid.ColumnDefinitions>
12712-
<ColumnDefinition Width="Auto" />
12713-
<ColumnDefinition />
12714-
</Grid.ColumnDefinitions>
12715-
<Grid.RowDefinitions>
12716-
<RowDefinition />
12717-
<RowDefinition Height="Auto" />
12718-
</Grid.RowDefinitions>
12719-
<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" />
12720-
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
12721-
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
12722-
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
12723-
</Border>
12724-
</ScrollViewer>
12725-
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
12726-
</Grid>
12710+
<AdornerDecorator Grid.Row="1">
12711+
<Grid>
12712+
<Grid.ColumnDefinitions>
12713+
<ColumnDefinition Width="Auto" />
12714+
<ColumnDefinition />
12715+
</Grid.ColumnDefinitions>
12716+
<Grid.RowDefinitions>
12717+
<RowDefinition />
12718+
<RowDefinition Height="Auto" />
12719+
</Grid.RowDefinitions>
12720+
<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" />
12721+
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
12722+
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
12723+
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
12724+
</Border>
12725+
</ScrollViewer>
12726+
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
12727+
</Grid>
12728+
</AdornerDecorator>
1272712729
</Grid>
1272812730
</Border>
1272912731
<ControlTemplate.Triggers>

‎src/Shared/HandyControl_Shared/Themes/Styles/MessageBox.xaml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,25 @@
6767
<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
6868
</Grid>
6969
</Grid>
70-
<Grid Grid.Row="1">
71-
<Grid.ColumnDefinitions>
72-
<ColumnDefinition Width="Auto"/>
73-
<ColumnDefinition/>
74-
</Grid.ColumnDefinitions>
75-
<Grid.RowDefinitions>
76-
<RowDefinition/>
77-
<RowDefinition Height="Auto"/>
78-
</Grid.RowDefinitions>
79-
<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"/>
80-
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
81-
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
82-
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
83-
</Border>
84-
</ScrollViewer>
85-
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
86-
</Grid>
70+
<AdornerDecorator Grid.Row="1">
71+
<Grid>
72+
<Grid.ColumnDefinitions>
73+
<ColumnDefinition Width="Auto"/>
74+
<ColumnDefinition/>
75+
</Grid.ColumnDefinitions>
76+
<Grid.RowDefinitions>
77+
<RowDefinition/>
78+
<RowDefinition Height="Auto"/>
79+
</Grid.RowDefinitions>
80+
<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"/>
81+
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
82+
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
83+
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
84+
</Border>
85+
</ScrollViewer>
86+
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
87+
</Grid>
88+
</AdornerDecorator>
8789
</Grid>
8890
</Border>
8991
<ControlTemplate.Triggers>

‎src/Shared/HandyControl_Shared/Themes/Theme.xaml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12858,23 +12858,25 @@
1285812858
<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
1285912859
</Grid>
1286012860
</Grid>
12861-
<Grid Grid.Row="1">
12862-
<Grid.ColumnDefinitions>
12863-
<ColumnDefinition Width="Auto" />
12864-
<ColumnDefinition />
12865-
</Grid.ColumnDefinitions>
12866-
<Grid.RowDefinitions>
12867-
<RowDefinition />
12868-
<RowDefinition Height="Auto" />
12869-
</Grid.RowDefinitions>
12870-
<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" />
12871-
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
12872-
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
12873-
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
12874-
</Border>
12875-
</ScrollViewer>
12876-
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
12877-
</Grid>
12861+
<AdornerDecorator Grid.Row="1">
12862+
<Grid>
12863+
<Grid.ColumnDefinitions>
12864+
<ColumnDefinition Width="Auto" />
12865+
<ColumnDefinition />
12866+
</Grid.ColumnDefinitions>
12867+
<Grid.RowDefinitions>
12868+
<RowDefinition />
12869+
<RowDefinition Height="Auto" />
12870+
</Grid.RowDefinitions>
12871+
<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" />
12872+
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
12873+
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
12874+
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
12875+
</Border>
12876+
</ScrollViewer>
12877+
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
12878+
</Grid>
12879+
</AdornerDecorator>
1287812880
</Grid>
1287912881
</Border>
1288012882
<ControlTemplate.Triggers>

0 commit comments

Comments
 (0)