|
|
@@ -96,8 +96,8 @@
|
|
|
|
|
|
<Separator
|
|
|
Width="1"
|
|
|
- Height="24"
|
|
|
- Margin="18,0,18,0"
|
|
|
+ Height="16"
|
|
|
+ Margin="10,0,10,0"
|
|
|
BorderBrush="{StaticResource color.sys.layout.divider}"
|
|
|
BorderThickness="5"
|
|
|
Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
|
|
|
@@ -436,9 +436,9 @@
|
|
|
<Separator
|
|
|
x:Name="Separator3"
|
|
|
Width="1"
|
|
|
- Height="24"
|
|
|
- Margin="18,0,18,0"
|
|
|
- BorderBrush="#1A000000"
|
|
|
+ Height="16"
|
|
|
+ Margin="10,0,10,0"
|
|
|
+ BorderBrush="{StaticResource color.sys.layout.divider}"
|
|
|
BorderThickness="5"
|
|
|
Style="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
|
|
|
|
|
|
@@ -459,16 +459,15 @@
|
|
|
|
|
|
<customControl:CustomIconToggleBtn
|
|
|
x:Name="BtnShowAnnot"
|
|
|
- Width="28"
|
|
|
- Height="28"
|
|
|
- Padding="0"
|
|
|
+
|
|
|
+ Padding="1.3,1,0,0"
|
|
|
Click="BtnTool_Click"
|
|
|
Command="{Binding ShowOrHiddenAnnotCommand}"
|
|
|
CommandParameter="{Binding ElementName=BtnShowAnnot}"
|
|
|
IsChecked="{Binding BtnShowAnnotIsChecked}"
|
|
|
- Style="{StaticResource ToggleBtnViewModeStyle}"
|
|
|
+ Style="{StaticResource ToggleBtnShowAnnotViewModeStyle}"
|
|
|
Tag="ShowAnnot">
|
|
|
- <Grid>
|
|
|
+ <!--<Grid>
|
|
|
<Path
|
|
|
Width="20"
|
|
|
Height="20"
|
|
|
@@ -486,7 +485,7 @@
|
|
|
<TranslateTransform X="-0.5" Y="-0.5" />
|
|
|
</Ellipse.RenderTransform>
|
|
|
</Ellipse>
|
|
|
- </Grid>
|
|
|
+ </Grid>-->
|
|
|
</customControl:CustomIconToggleBtn>
|
|
|
</WrapPanel>
|
|
|
</Border>
|
