|
@@ -106,20 +106,10 @@ namespace PDF_Master.ViewModels.Tools
|
|
|
{
|
|
|
if (e.ClickCount == 1)
|
|
|
{
|
|
|
- //if (sender is CPDFViewer pDFViewer)
|
|
|
- //{
|
|
|
- // if (pDFViewer.ToolManager.CurrentAnnotArgs != null)
|
|
|
- // {
|
|
|
- // if (pDFViewer.ToolManager.CurrentAnnotArgs is FreehandAnnotArgs freehand)
|
|
|
- // {
|
|
|
- // PDFViewer.SelectAnnotation(freehand.PageIndex, freehand.AnnotIndex);
|
|
|
- // }
|
|
|
- // }
|
|
|
- //}
|
|
|
- //bool isTabItemAnnotation = IsBOTATabItemShow(out BOTAContentViewModel bOTAContentViewModel, out BOTAContent bOTAContent, "TabItemBookMark");
|
|
|
+
|
|
|
|
|
|
//BOTA所有列表都需要响应 单击阅读页取消多选
|
|
|
- if (viewContentViewModel.OpenBOTA == true/* && isTabItemAnnotation == true && bOTAContent.TabItemBookMark.IsSelected == true*/)
|
|
|
+ if (viewContentViewModel.OpenBOTA == true)
|
|
|
{
|
|
|
this.events.GetEvent<CleanSelectAllEvent>().Publish(new CleanSelectAllArgs() { Unicode = App.mainWindowViewModel.SelectedItem.Unicode, IsCleanSelectAll = true });
|
|
|
}
|
|
@@ -130,7 +120,8 @@ namespace PDF_Master.ViewModels.Tools
|
|
|
{
|
|
|
var type = CurrentSelectedAnnot.EventType;
|
|
|
if (type != AnnotArgsType.AnnotSticky && type != AnnotArgsType.AnnotFreeText &&
|
|
|
- type != AnnotArgsType.AnnotHighlight && type != AnnotArgsType.AnnotUnderline && type != AnnotArgsType.AnnotStrikeout)
|
|
|
+ type != AnnotArgsType.AnnotHighlight && type != AnnotArgsType.AnnotUnderline
|
|
|
+ && type != AnnotArgsType.AnnotStrikeout &&type!=AnnotArgsType.AnnotLink)
|
|
|
{
|
|
|
int dpi = DpiHelpers.Dpi;
|
|
|
var rect = CurrentSelectedAnnot.ClientRect;
|
|
@@ -145,7 +136,7 @@ namespace PDF_Master.ViewModels.Tools
|
|
|
var point = e.GetPosition(ui);
|
|
|
int pageIndex = 0;
|
|
|
Point pagePoint = new Point(0, 0);
|
|
|
- //Todo:等黎总需要更新ComPDFKit.dll
|
|
|
+
|
|
|
PDFViewer.ConvertViewPointToPage(point, out pageIndex, out pagePoint);
|
|
|
if (pagePoint.X >= rect.Left && pagePoint.X <= rect.Right && pagePoint.Y >= rect.Top && pagePoint.Y <= rect.Bottom)
|
|
|
PopAnnotNoteText(CurrentSelectedAnnot);
|