This commit is contained in:
艾竹
2023-03-15 23:05:41 +08:00
parent 70dac7d41c
commit d97938cc2b
8 changed files with 113 additions and 39 deletions

View File

@@ -55,9 +55,9 @@
</Style>
</ContextMenu.ItemContainerStyle>
</ContextMenu>
</Grid.ContextMenu>
</Grid.ContextMenu>
<Grid IsHitTestVisible="False">
<Grid IsHitTestVisible="{Binding IsEditing}">
<Border BorderThickness="{Binding BorderThickness}"
BorderBrush="{Binding ColorViewModel.LineColor,Converter={StaticResource ColorBrushConverter}}"
Background="{Binding ColorViewModel.FillColor,Converter={StaticResource ColorBrushConverter}}"
@@ -77,10 +77,15 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<controls:RateControl Grid.Column="0" Width="18" Height="18" Rate="{Binding Rate}" Visibility="{Binding Rate,Converter={StaticResource NullableToVisibilityConverter}}"/>
<controls:PriorityControl Grid.Column="1" Width="18" Height="18" Priority="{Binding Priority}" Visibility="{Binding Priority,Converter={StaticResource NullableToVisibilityConverter}}"/>
<controls:RateControl Grid.Column="0" Width="20" Height="20" Rate="{Binding Rate}"
Visibility="{Binding Rate,Converter={StaticResource NullableToVisibilityConverter}}"/>
<controls:PriorityControl Grid.Column="1" Width="20" Height="20" Priority="{Binding Priority}"
Visibility="{Binding Priority,Converter={StaticResource NullableToVisibilityConverter}}"/>
<dd:TextControl Grid.Column="2" />
<controls:LinkControl Grid.Column="3"/>
<controls:LinkControl Grid.Column="3"
Visibility="{Binding LinkInfo,Converter={StaticResource NullableToVisibilityConverter}}"
Url="{Binding LinkInfo.Url}"
ToolTip="{Binding LinkInfo.Text}" IsHitTestVisible="True"/>
<controls:RemarkControl Grid.Column="4"/>
<controls:TagControl Grid.Column="5"/>
</Grid>