结构调整

This commit is contained in:
kwai
2023-02-21 19:47:46 +08:00
parent 71ed33f881
commit c227076076
7 changed files with 594 additions and 386 deletions

View File

@@ -6,6 +6,7 @@
<dd:ColorBrushConverter x:Key="ColorBrushConverter"/>
<dd:DoubleToCornerRadius x:Key="DoubleToCornerRadius"/>
<dd:IntToVisibilityConverter x:Key="IntToVisibilityConverter"/>
<dd:DoubleToThickness x:Key="DoubleToThickness"/>
<!-- Toggle Button -->
<Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
@@ -54,10 +55,10 @@
</ContextMenu>
</Grid.ContextMenu>
<Grid IsHitTestVisible="False">
<Border BorderThickness="1"
<Border BorderThickness="{Binding BorderThickness}"
BorderBrush="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
CornerRadius="{Binding CornerRadius,Converter={StaticResource DoubleToCornerRadius}}">
CornerRadius="{Binding CornerRadius}">
</Border>
</Grid>
</Grid>
@@ -81,16 +82,15 @@
</ContextMenu>
</Grid.ContextMenu>
<Grid IsHitTestVisible="False">
<Border BorderThickness="1"
<Border BorderThickness="{Binding BorderThickness}"
BorderBrush="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
CornerRadius="{Binding CornerRadius,Converter={StaticResource DoubleToCornerRadius}}">
CornerRadius="{Binding CornerRadius}">
</Border>
</Grid>
<ToggleButton x:Name="toggle" IsChecked="{Binding IsExpanded}" Style="{StaticResource ExpandCollapseToggleStyle}" HorizontalAlignment="Left" Margin="-15,0,0,0" Visibility="{Binding Children.Count,Converter={StaticResource IntToVisibilityConverter}}"/>
</Grid>
<ControlTemplate.Triggers>
<DataTrigger Binding="{Binding IsRightLayout}" Value="false">
<Setter TargetName="toggle" Property="HorizontalAlignment" Value="Right"/>
<Setter TargetName="toggle" Property="Margin" Value="0,0,-15,0"/>
@@ -116,10 +116,10 @@
</ContextMenu>
</Grid.ContextMenu>
<Grid IsHitTestVisible="False">
<Border BorderThickness="0,0,0,1"
<Border BorderThickness="{Binding BorderThickness}"
BorderBrush="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}">
Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
CornerRadius="{Binding CornerRadius}">
</Border>
</Grid>
<ToggleButton x:Name="toggle" IsChecked="{Binding IsExpanded}" Style="{StaticResource ExpandCollapseToggleStyle}" HorizontalAlignment="Left" Margin="-15,0,0,0" Visibility="{Binding Children.Count,Converter={StaticResource IntToVisibilityConverter}}"/>