|
@@ -7,11 +7,8 @@ using Compdfkit_Tools.PDFControlUI;
|
|
|
using ComPDFKitViewer;
|
|
|
using ComPDFKitViewer.BaseObject;
|
|
|
using ComPDFKitViewer.Widget;
|
|
|
-using Nager.Country.Currencies;
|
|
|
using System;
|
|
|
using System.Collections.Generic;
|
|
|
-using System.Diagnostics;
|
|
|
-using System.Linq;
|
|
|
using System.Reflection;
|
|
|
using System.Windows;
|
|
|
using System.Windows.Controls;
|
|
@@ -19,7 +16,6 @@ using System.Windows.Input;
|
|
|
using Compdfkit_Tools.Helper;
|
|
|
using ComPDFKit.Tool.DrawTool;
|
|
|
using static ComPDFKit.Tool.CPDFToolManager;
|
|
|
-using static Compdfkit_Tools.PDFControlUI.CPDFViewModeUI;
|
|
|
using SplitMode = Compdfkit_Tools.PDFControlUI.CPDFViewModeUI.SplitMode;
|
|
|
using System.Threading;
|
|
|
using System.Threading.Tasks;
|
|
@@ -655,22 +651,28 @@ namespace Compdfkit_Tools.PDFControl
|
|
|
|
|
|
if (hitAnnot != null)
|
|
|
{
|
|
|
- newCursor = annotEditCursor;
|
|
|
if (hitAnnot is LinkAnnot || hitAnnot is BaseWidget)
|
|
|
{
|
|
|
newCursor = Cursors.Hand;
|
|
|
+ cursorSet = true;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ newCursor = annotEditCursor;
|
|
|
+ cursorSet = true;
|
|
|
}
|
|
|
- cursorSet = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- newCursor = (PDFToolManager.GetToolType() == ToolType.Pan) ? panToolCursor : Cursors.Arrow;
|
|
|
- cursorSet = true;
|
|
|
-
|
|
|
- if (PDFViewTool.IsText())
|
|
|
+ if (!PDFViewTool.IsSelectRectMousePoint())
|
|
|
{
|
|
|
- newCursor = Cursors.IBeam;
|
|
|
- cursorSet = true;
|
|
|
+ newCursor = (PDFToolManager.GetToolType() == ToolType.Pan) ? panToolCursor : Cursors.Arrow;
|
|
|
+
|
|
|
+ if (PDFViewTool.IsText())
|
|
|
+ {
|
|
|
+ newCursor = Cursors.IBeam;
|
|
|
+ }
|
|
|
+ cursorSet = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -701,6 +703,7 @@ namespace Compdfkit_Tools.PDFControl
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if (newCursor != GetCPDFViewer().Cursor)
|
|
|
{
|
|
|
GetCPDFViewer().Cursor = newCursor;
|