ComPDFKit.Tool(win)-编辑悬浮颜色调整

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.MultiSelectedRect.cs

@@ -154,7 +154,7 @@ namespace ComPDFKit.Tool
                     editAreaMultiIndex.Add(startSelectedIndex);
 
                     SelectedRect startselectedrect = new SelectedRect(GetDefaultDrawParam(), type);
-                    startselectedrect.SetEditPen(editPen);
+                    startselectedrect.SetEditPen(editPen, editHoverPen);
                     startselectedrect.SetDrawMoveType(DrawMoveType.kReferenceLine);
                     startselectedrect.SetRect(startSelectedRect.GetRect(), currentZoom);
                     startselectedrect.SetMaxRect(MaxRect);
@@ -173,7 +173,7 @@ namespace ComPDFKit.Tool
                 editAreaMultiIndex.Add(editAreaIndex);
                 multiSelectedRect.SetSelectedType(type);
                 SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), type);
-                selectedRect.SetEditPen(editPen);
+                selectedRect.SetEditPen(editPen, editHoverPen);
                 selectedRect.SetDrawMoveType(DrawMoveType.kReferenceLine);
                 selectedRect.SetRect(selectedRects, currentZoom);
                 selectedRect.SetMaxRect(MaxRect);
@@ -192,7 +192,7 @@ namespace ComPDFKit.Tool
                 isOpen = false;
                 GetSelectedEditAreaForIndex(out int pageIndex, out int editAreaIndex);
                 SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), type);
-                selectedRect.SetEditPen(editPen);
+                selectedRect.SetEditPen(editPen, editHoverPen);
                 selectedRect.SetDrawMoveType(DrawMoveType.kReferenceLine);
                 selectedRect.SetRect(selectedRects, currentZoom);
                 selectedRect.SetMaxRect(MaxRect);

Demo/Examples/ComPDFKit.Tool/CPDFViewerTool.TextEdit.cs

@@ -158,7 +158,9 @@ namespace ComPDFKit.Tool
 
         protected DrawPointType drawEditPointType = DrawPointType.Square;
 
-        public Pen editPen = null;
+        protected Pen editPen = null;
+
+        protected Pen editHoverPen = null;
 
         /// <summary>
         /// Edit border point style settings
@@ -177,9 +179,10 @@ namespace ComPDFKit.Tool
         /// Edit preliminary display of border style status
         /// </summary>
         /// <param name="editPen"></param>
-        public void SetEditPen(Pen editPen = null)
+        public void SetEditPen(Pen editPen = null, Pen editHoverPen=null)
         {
             this.editPen = editPen;
+            this.editHoverPen = editHoverPen;
         }
 
         /// <summary>
@@ -380,7 +383,7 @@ namespace ComPDFKit.Tool
                 foreach (CPDFEditArea editArea in item.CPDFEditPageObj.GetEditAreaList())
                 {
                     SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), SelectedType.PDFEdit);
-                    selectedRect.SetEditPen(editPen);
+                    selectedRect.SetEditPen(editPen, editHoverPen);
                     selectedRect.SetDrawMoveType(DrawMoveType.kReferenceLine);
                     customizeLayer.Children.Add(selectedRect);
 
@@ -1421,7 +1424,7 @@ namespace ComPDFKit.Tool
         public void DrawTest(Rect maxRect, int index)
         {
             SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), SelectedType.PDFEdit);
-            selectedRect.SetEditPen(editPen);
+            selectedRect.SetEditPen(editPen, editHoverPen);
             selectedRect.SetDrawMoveType(DrawMoveType.kReferenceLine);
             BaseLayer customizeLayer = PDFViewer.GetViewForTag(textEditTag);
 
@@ -2090,7 +2093,7 @@ namespace ComPDFKit.Tool
                         {
                             SelectedRect selectedRects = GetSelectedRectForEditAreaObject(editArea);
                             SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), SelectedType.PDFEdit);
-                            selectedRect.SetEditPen(editPen);
+                            selectedRect.SetEditPen(editPen, editHoverPen);
                             multiSelectedRect.SetSelectedType(SelectedType.PDFEdit);
                             selectedRect.SetDrawMoveType(DrawMoveType.kReferenceLine);
                             selectedRect.SetRect(selectedRects.GetRect(), currentZoom);

Demo/Examples/ComPDFKit.Tool/ComPDFKit.Tool.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ComPDFKit.Tool</RootNamespace>
     <AssemblyName>ComPDFKit.Tool</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -81,6 +81,12 @@
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ComPDFKit.NET">
+      <HintPath>..\..\..\..\PDF_Reader_Pro_Windows_git\pdfreaderpro_windows_exe\PDFReader_WPF\PDFReader_WPF\ComPDFKit.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="ComPDFKit.Viewer">
+      <HintPath>..\..\..\..\PDF_Reader_Pro_Windows_git\pdfreaderpro_windows_exe\PDFReader_WPF\PDFReader_WPF\ComPDFKit.Viewer.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -200,15 +206,5 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.NET</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\compdfkit_windows_rebuild\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
-      <Project>{783263cf-0da3-4095-9df8-2c4a6b3ff908}</Project>
-      <Name>ComPDFKit.Viewer</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Demo/Examples/ComPDFKit.Tool/DrawTool/SelectedRect.cs

@@ -423,7 +423,7 @@ namespace ComPDFKit.Tool.DrawTool
                     if (isHover)
                     {
                         colorBrush = DrawParam.PDFEditRectFillHoverBrush;
-                        pen = DrawParam.PDFEditRectLineHoverPen;
+                        pen = editHoverPen;//DrawParam.PDFEditRectLineHoverPen;
                     }
                     else
                     {
@@ -445,7 +445,7 @@ namespace ComPDFKit.Tool.DrawTool
             }
         }
 
-        public void SetEditPen(Pen editPen = null)
+        public void SetEditPen(Pen editPen = null,Pen editHoverPen=null)
         {
             if (editPen == null)
             {
@@ -455,6 +455,15 @@ namespace ComPDFKit.Tool.DrawTool
             {
                 this.editPen=new Pen(editPen.Brush,editPen.Thickness);
             }
+            if (editHoverPen == null)
+            {
+                this.editHoverPen = DrawParam.PDFEditRectLineHoverPen;
+            }
+            else
+            {
+                this.editHoverPen = editHoverPen;
+            }
+
 
         }
 

Demo/Examples/ComPDFKit.Tool/DrawTool/SelectedRect.protected.cs

@@ -103,6 +103,8 @@ namespace ComPDFKit.Tool.DrawTool
 
         private Pen editPen { get; set; } = new Pen(new SolidColorBrush(Color.FromRgb(71, 126, 222)), 2) { DashStyle = DashStyles.Dash };
 
+        private Pen editHoverPen { get; set; } = new Pen(new SolidColorBrush(Color.FromRgb(71, 126, 222)), 2) { DashStyle = DashStyles.Dash };
+
         /// <summary>
         /// Current actual display width and height of PDFVIewer.
         /// </summary>