This commit is contained in:
NaBian committed 2021-12-03 13:23:37 +08:00
1 parent 034238fb9e
commit 55e35e6814
4 files changed
+76 -68

No files matched your search

@@ -68,23 +68,25 @@
<ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/> <ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1"> <AdornerDecorator Grid.Row="1">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto"/> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> <ColumnDefinition/>
<Grid.RowDefinitions> </Grid.ColumnDefinitions>
<RowDefinition/> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition/>
</Grid.RowDefinitions> <RowDefinition Height="Auto"/>
<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"/> </Grid.RowDefinitions>
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top"> <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"/>
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left"> <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" /> <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
</Border> <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
</ScrollViewer> </Border>
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/> </ScrollViewer>
</Grid> <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
</Grid>
</AdornerDecorator>
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
@@ -12707,23 +12707,25 @@
<ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" /> <ContentPresenter shell:WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1"> <AdornerDecorator Grid.Row="1">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto" /> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> <ColumnDefinition />
<Grid.RowDefinitions> </Grid.ColumnDefinitions>
<RowDefinition /> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition />
</Grid.RowDefinitions> <RowDefinition Height="Auto" />
<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" /> </Grid.RowDefinitions>
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top"> <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" />
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left"> <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" /> <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
</Border> <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
</ScrollViewer> </Border>
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" /> </ScrollViewer>
</Grid> <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
</Grid>
</AdornerDecorator>
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
@@ -67,23 +67,25 @@
<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/> <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}"/>
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1"> <AdornerDecorator Grid.Row="1">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto"/> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions> <ColumnDefinition/>
<Grid.RowDefinitions> </Grid.ColumnDefinitions>
<RowDefinition/> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition/>
</Grid.RowDefinitions> <RowDefinition Height="Auto"/>
<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"/> </Grid.RowDefinitions>
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top"> <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"/>
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left"> <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" /> <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
</Border> <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
</ScrollViewer> </Border>
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/> </ScrollViewer>
</Grid> <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center"/>
</Grid>
</AdornerDecorator>
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
@@ -12858,23 +12858,25 @@
<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" /> <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Row="1"> <AdornerDecorator Grid.Row="1">
<Grid.ColumnDefinitions> <Grid>
<ColumnDefinition Width="Auto" /> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> <ColumnDefinition />
<Grid.RowDefinitions> </Grid.ColumnDefinitions>
<RowDefinition /> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition />
</Grid.RowDefinitions> <RowDefinition Height="Auto" />
<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" /> </Grid.RowDefinitions>
<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top"> <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" />
<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left"> <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" /> <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
</Border> <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
</ScrollViewer> </Border>
<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" /> </ScrollViewer>
</Grid> <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
</Grid>
</AdornerDecorator>
</Grid> </Grid>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>