编辑功能开发

PDF Office/ViewModels/PropertyPanel/PDFEdit/ImageEditPropertyViewModel.cs

@@ -384,7 +384,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.PDFEdit
         }
         private void GetPDFEdit()
         {
-            var tranUI = (TextEditEvent.Transparency / 255.0)*100;
+            var tranUI = (TextEditEvent.Transparency / (255.0*255.0))*100;
             var temp = Math.Round((double)tranUI, 0);
             Transpent = temp;
             OpacityUI = temp/100.0;

PDF Office/ViewModels/Tools/TextEditToolContentViewModel.cs

@@ -31,6 +31,7 @@ namespace PDF_Master.ViewModels.Tools
         #endregion
 
         #region 属性
+
         private bool _isTextEdit = false;
         public bool IsTextEdit
         {
@@ -51,6 +52,7 @@ namespace PDF_Master.ViewModels.Tools
         public DelegateCommand AddTextCommand { get; set; }
         public DelegateCommand AddImgCommand { get; set; }
         public DelegateCommand EditTextModeCommand { get; set; }
+
         #endregion
 
         #region 初始化
@@ -158,7 +160,46 @@ namespace PDF_Master.ViewModels.Tools
         }
         #endregion
 
+        #region 快捷键
+        private void ShortCut_KeyDown(object sender, KeyEventArgs e)
+        {
+
+  
+            if (e.Key == Key.Escape)
+            {
+                if (PDFViewer != null)
+                {
+                   
+
+                    if (PDFViewer.ToolManager != null && IsTextEdit == true)
+                       {
+
+                           PDFViewer.RemovePDFEditEmptyText();
+                          PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                          PDFViewer.ReloadDocument();
+                          ShowPropertyPanel(true);
+
+
+
+                    }
+
+                    else if (PDFViewer.ToolManager != null && IsImgEdit == true)
+                    {
+                        PDFViewer.RemovePDFEditEmptyText();
+                        PDFViewer.SetMouseMode(MouseModes.PDFEdit);
+                        PDFViewer.ReloadDocument();
+                        ShowPropertyPanel(true);
+                    }
+                    if (PDFViewer.MouseMode == MouseModes.PDFEdit)
+                    {
+                        PDFViewer.RemoveTool(false);
+                    }
+                }
+                }
+          
 
+        }
+        #endregion
         public void AddContent(object obj)
         {
             if (PDFViewer == null || obj == null || obj as CustomIconToggleBtn == null) return;
@@ -179,6 +220,7 @@ namespace PDF_Master.ViewModels.Tools
                     IsImgEdit = false;
                     IsTextEdit = true;
                     PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditText);
+                    PDFViewer.SetMouseMode(MouseModes.PDFEdit);
                     PDFViewer.ReloadDocument();
                     PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.EditText);
                    
@@ -189,6 +231,7 @@ namespace PDF_Master.ViewModels.Tools
                     IsTextEdit = false;
                     PDFViewer.SetPDFEditType(ComPDFKit.PDFPage.CPDFEditType.EditImage);
                     PDFViewer.SetPDFEditCreateType(ComPDFKit.PDFPage.CPDFEditType.EditImage);
+                    PDFViewer.SetMouseMode(MouseModes.PDFEdit);
                     PDFViewer.ReloadDocument();
                 }
             }
@@ -253,10 +296,14 @@ namespace PDF_Master.ViewModels.Tools
 
                 PDFViewer.CustomNotifyHandler -= PDFViewer_CustomNotifyHandler;
                 PDFViewer.CustomNotifyHandler += PDFViewer_CustomNotifyHandler;
+
+                KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
+                KeyEventsHelper.KeyDown += ShortCut_KeyDown;
             }
         }
         private void PDFViewer_PDFEditActiveHandler(object sender, List<PDFEditEvent> e)
         {
+        
 
             if (e != null && e.Count > 0)
             {
@@ -336,9 +383,8 @@ namespace PDF_Master.ViewModels.Tools
         }
         private void PDFViewer_CustomNotifyHandler(object sender, CustomNotityData e)
         {
-          
-        
-                if (e.NotifyType == CustomNotifyType.PDFEditImage)
+
+            if (e.NotifyType == CustomNotifyType.PDFEditImage)
                 {
                     OpenFileDialog openFileDialog = new OpenFileDialog();
 
@@ -365,6 +411,7 @@ namespace PDF_Master.ViewModels.Tools
             PDFViewer.PDFEditActiveHandler -= PDFViewer_PDFEditActiveHandler;
             PDFViewer.PDFEditCommandHandler -= PDFViewer_PDFEditCommandHandler;
              PDFViewer.CustomNotifyHandler -= PDFViewer_CustomNotifyHandler;
+            KeyEventsHelper.KeyDown -= ShortCut_KeyDown;
             ShowPropertyPanel(false);
         }
 

PDF Office/Views/PropertyPanel/PDFEdit/TextEditProperty.xaml

@@ -393,6 +393,7 @@
                 </StackPanel>
 
                 <TextBlock
+                    Visibility="Collapsed"
                     x:Name="AlignImg"
                     Margin="0,18,0,10"
                     FontFamily="Segoe UI"
@@ -407,6 +408,7 @@
 
         <FormControl:LayoutAglinContent
             x:Name="laoutAglin"
+            Visibility="Collapsed"
             Grid.Row="1"
             IsLayoutAlign="{Binding IsLayoutAlign}"
             IsLayoutAvgAlign="{Binding IsLayoutAvgAlign}">