其他-冲突

PDF Office/Styles/CustomBtnStyle.xaml

@@ -10,6 +10,7 @@
     <SolidColorBrush x:Key="Button.Static.Background" Color="#273C62" />
     <SolidColorBrush x:Key="Button.Static.Border" Color="#FF273C62" />
     <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#DFE1E5" />
+    <SolidColorBrush x:Key="Button.IsChecked.Background" Color="#DFE1E5" />
     <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#273C62" />
     <SolidColorBrush x:Key="Button.Pressed.Background" Color="#29477EDE" />
     <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B" />
@@ -191,7 +192,7 @@
         </Setter>
         <Style.Triggers>
             <Trigger Property="IsChecked" Value="True">
-                <Setter Property="Background" Value="{StaticResource Button.Pressed.Background}" />
+                <Setter Property="Background" Value="{StaticResource Button.IsChecked.Background}" />
             </Trigger>
             <Trigger Property="IsChecked" Value="False">
                 <Setter Property="Background" Value="Transparent" />

PDF Office/ViewModels/Tools/AnnotToolContentViewModel.cs

@@ -166,7 +166,8 @@ namespace PDF_Master.ViewModels.Tools
             {
                 //其余注释工具 取消选中
                 StrAnnotToolChecked = "";
-                BtnSelecttoolIsChecked = false; 
+                BtnLinkIsChecked = false;
+                BtnSelecttoolIsChecked = false;
                 viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
             }
         }
@@ -284,7 +285,9 @@ namespace PDF_Master.ViewModels.Tools
         {
             if (BtnHandIsChecked)
                 BtnHandIsChecked = false;
-
+            //选中取消问题待优化 2023/4/4
+            if(BtnSelecttoolIsChecked&& tag!= "SnapshotEdit")
+                BtnSelecttoolIsChecked=false;
             PDFViewer.ClearSelectAnnots();
 
             //选中内容选择工具按钮