|
@@ -19,6 +19,7 @@
|
|
|
</Style>
|
|
|
<dataconvert:UnVisivleConvert x:Key="UnVisivleConvert"/>
|
|
|
<dataconvert:IntAndTagToBoolMultiBinding x:Key="IntAndTagToBoolMultiBinding"/>
|
|
|
+ <dataconvert:ListCountAndBoolToVisible x:Key="ListCountAndBoolToVisible"/>
|
|
|
<dataconvert:IntToColorBrush x:Key="IntToColorBrush"/>
|
|
|
<dataconvert:ListCountToVisible x:Key="ListCountToVisible"/>
|
|
|
<dataconvert:CenterToolTipConverter x:Key="CenterToolTipConverter"/>
|
|
@@ -168,9 +169,15 @@
|
|
|
</Grid.ColumnDefinitions>
|
|
|
<Border Grid.Column="1" Height="182" BorderThickness="1" CornerRadius="4" BorderBrush="{StaticResource color.field.border.norm}">
|
|
|
<Grid>
|
|
|
- <InkCanvas x:Name="inkCanvas" DefaultDrawingAttributes="{Binding DrawingAttributeObject}" Strokes="{Binding StrokesObject}"/>
|
|
|
+ <InkCanvas x:Name="inkCanvas" PreviewMouseLeftButtonDown="inkCanvas_MouseLeftButtonDown" PreviewMouseLeftButtonUp="inkCanvas_MouseLeftButtonUp" DefaultDrawingAttributes="{Binding DrawingAttributeObject}" Strokes="{Binding StrokesObject}"/>
|
|
|
|
|
|
- <Grid Opacity="0.7" x:Name="PlanGrid" IsHitTestVisible="False" Background="#F3F3F3" Visibility="{Binding StrokesObject.Count,Converter={StaticResource ListCountToVisible}}">
|
|
|
+ <Grid Opacity="0.7" x:Name="PlanGrid" IsHitTestVisible="False" Background="#F3F3F3">
|
|
|
+ <Grid.Visibility>
|
|
|
+ <MultiBinding Converter="{StaticResource ListCountAndBoolToVisible }" Mode="OneWay">
|
|
|
+ <Binding Path="StrokesObject.Count"/>
|
|
|
+ <Binding Path="IsMouseDown"/>
|
|
|
+ </MultiBinding>
|
|
|
+ </Grid.Visibility>
|
|
|
<TextBlock Text="此处绘制签名" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
|
|
</Grid>
|
|
|
<Button Style="{StaticResource btn.sec}" Margin="0,0,8,8" Width="43" Height="24" HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="Clear" Command="{Binding ClearInkCanvasCommnad}" Visibility="{Binding ElementName=PlanGrid,Path=Visibility,Converter={StaticResource UnVisivleConvert}}"/>
|