|
@@ -399,6 +399,8 @@ namespace ComPDFKit.Tool
|
|
|
operateChildrenIndex = -1;
|
|
|
CaretVisual caretVisual = new CaretVisual(GetDefaultDrawParam());
|
|
|
customizeLayer.Children.Add(caretVisual);
|
|
|
+
|
|
|
+ MultiSelectedRect multiSelectedRect = CommonHelper.FindVisualChild<MultiSelectedRect>(PDFViewer.GetViewForTag(MultiSelectedRectViewTag));
|
|
|
foreach (RenderData item in currentRenderFrame.GetRenderDatas())
|
|
|
{
|
|
|
if (item.CPDFEditPageObj == null)
|
|
@@ -464,7 +466,20 @@ namespace ComPDFKit.Tool
|
|
|
selectedRect.SetRect(editAreaRect, currentZoom);
|
|
|
selectedRect.SetMaxRect(item.PageBound);
|
|
|
selectedRect.SetIgnorePointsAll();
|
|
|
- selectedRect.Draw();
|
|
|
+ if ((editArea is CPDFEditPathArea))
|
|
|
+ {
|
|
|
+ if (multiSelectedRect.selectedRects.Count==0)
|
|
|
+ {
|
|
|
+ selectedRect.Draw();
|
|
|
+ }
|
|
|
+
|
|
|
+ selectedRect.IsPath = true;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ selectedRect.Draw();
|
|
|
+ }
|
|
|
+
|
|
|
EditAreaObject editAreaObject = new EditAreaObject();
|
|
|
editAreaObject.ControlType = PointControlType.None;
|
|
|
editAreaObject.cPDFEditArea = editArea;
|
|
@@ -2325,7 +2340,7 @@ namespace ComPDFKit.Tool
|
|
|
{
|
|
|
if ((contentEditType & CPDFEditType.EditImage) != CPDFEditType.EditImage)
|
|
|
continue;
|
|
|
-
|
|
|
+
|
|
|
editAreaRect = DataConversionForWPF.CRectConversionForRect((editArea as CPDFEditImageArea).GetClipRect());
|
|
|
}
|
|
|
else if (editArea.Type == CPDFEditType.EditText)
|
|
@@ -2339,14 +2354,14 @@ namespace ComPDFKit.Tool
|
|
|
{
|
|
|
if ((contentEditType & CPDFEditType.EditPath) != CPDFEditType.EditPath)
|
|
|
continue;
|
|
|
-
|
|
|
+
|
|
|
editAreaRect = DataConversionForWPF.CRectConversionForRect((editArea as CPDFEditPathArea).GetClipRect());
|
|
|
}
|
|
|
|
|
|
if (rectFrameSelect.IntersectsWith(editAreaRect))
|
|
|
{
|
|
|
SelectedRect editAreaSelectedRect = GetSelectedRectForEditAreaObject(editArea);
|
|
|
- if(editAreaSelectedRect == null && editArea is CPDFEditPathArea)
|
|
|
+ if (editAreaSelectedRect == null && editArea is CPDFEditPathArea)
|
|
|
{
|
|
|
cachePathList.Add(editArea as CPDFEditPathArea);
|
|
|
|
|
@@ -2379,6 +2394,7 @@ namespace ComPDFKit.Tool
|
|
|
|
|
|
this.editArea.Add(editAreaSelectedRect, editAreaObjects);
|
|
|
}
|
|
|
+
|
|
|
SelectedRect selectedRect = new SelectedRect(GetDefaultDrawParam(), SelectedType.PDFEdit);
|
|
|
selectedRect.SetEditPen(editPen, editHoverPen);
|
|
|
multiSelectedRect.SetSelectedType(SelectedType.PDFEdit);
|
|
@@ -2418,7 +2434,7 @@ namespace ComPDFKit.Tool
|
|
|
|
|
|
multiSelectedRect.SetRect(editAreaSelectedRect.GetRect());
|
|
|
multiSelectedRect.SetMaxRect(editAreaSelectedRect.GetMaxRect());
|
|
|
- multiSelectedRect.Draw();
|
|
|
+ //multiSelectedRect.Draw();
|
|
|
}
|
|
|
}
|
|
|
}
|