Browse Source

高亮/下划线/删除线 优化创建

OYXH\oyxh 1 year ago
parent
commit
23d79b8e12
1 changed files with 29 additions and 5 deletions
  1. 29 5
      PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

+ 29 - 5
PDF Office/ViewModels/Tools/AnnotToolContentViewModel.Command.cs

@@ -291,15 +291,38 @@ namespace PDF_Master.ViewModels.Tools
             switch (annot.EventType)
             {
                 case AnnotArgsType.AnnotHighlight:
-                    GetHighLight(e.AnnotItemsList);
+                    if (e.IsAnnotCreateReset)
+                    {
+                        GetHighLight();
+                    }
+                    else
+                    {
+                        GetHighLight(e.AnnotItemsList);
+                    }
+
                     break;
 
-                case AnnotArgsType.AnnotUnderline:
-                    GetUnderLine(e.AnnotItemsList);
+                case AnnotArgsType.AnnotUnderline:
+                    if (e.IsAnnotCreateReset)
+                    {
+                        GetUnderLine();
+                    }
+                    else
+                    {
+                        GetUnderLine(e.AnnotItemsList);
+                    }
+
                     break;
 
-                case AnnotArgsType.AnnotStrikeout:
-                    GetStrikeout(e.AnnotItemsList);
+                case AnnotArgsType.AnnotStrikeout:
+                    if (e.IsAnnotCreateReset)
+                    {
+                        GetStrikeout();
+                    }
+                    else
+                    {
+                        GetStrikeout(e.AnnotItemsList);
+                    }
                     break;
 
                 case AnnotArgsType.AnnotSquiggly:
@@ -1002,6 +1025,7 @@ namespace PDF_Master.ViewModels.Tools
                         }
                     }
                     break;
+
                 default:
                     e?.DoCommand();
                     break;