Merge pull request '[pdf] Locks for markup annots' (#354) from fix/lo…

…cks-pdf into develop Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/sdkjs/pulls/354
ONLYOFFICE · Nov 26, 2024 · 9058a25 · 9058a25
2 parents 25ff4a2 + ca91f95
commit 9058a25
Show file tree

Hide file tree

Showing 5 changed files with 460 additions and 393 deletions.
diff --git a/pdf/api.js b/pdf/api.js
@@ -623,7 +623,9 @@
 		let oFile	= oViewer.file;
 		let oDoc 	= this.getPDFDoc();
 
-		let nPos = bBefore ? oViewer.currentPage : oViewer.currentPage + 1;
+		let oThumbnails = oViewer.thumbnails;
+		let aIndexes = oThumbnails.getSelectedPages();
+		let nPos = bBefore ? Math.min.apply(null, aIndexes) : Math.max.apply(null, aIndexes) + 1;
 
 		oDoc.DoAction(function() {
 			let oPageToClone = bBefore ? oFile.pages[oViewer.currentPage] : (oFile.pages[oViewer.currentPage + 1] || oFile.pages[oViewer.currentPage]);

diff --git a/pdf/src/annotations/highlights.js b/pdf/src/annotations/highlights.js
@@ -205,12 +205,9 @@
                 y: aPoints[7]
             }
 
-            let dx1 = oPoint2.x - oPoint1.x;
-            let dy1 = oPoint2.y - oPoint1.y;
-            let dx2 = oPoint4.x - oPoint3.x;
-            let dy2 = oPoint4.y - oPoint3.y;
-            let angle1          = Math.atan2(dy1, dx1);
-            let angle2          = Math.atan2(dy2, dx2);
+            let dx = oPoint2.x - oPoint1.x;
+            let dy = oPoint2.y - oPoint1.y;
+            let angle1          = Math.atan2(dy, dx);
             let rotationAngle   = angle1;
 
             oGraphicsPDF.SetGlobalAlpha(this.GetOpacity());
@@ -237,6 +234,9 @@
             oGraphicsPDF.Fill();
             AscPDF.endMultiplyMode(oGraphicsPDF.GetContext());
         }
+
+        let aUnitedRegion = this.GetUnitedRegion();
+        oGraphicsPDF.DrawLockObjectRect(this.Lock.Get_Type(), aUnitedRegion.regions);
     };
 
     /**
@@ -317,6 +317,9 @@
 
             oGraphicsPDF.Stroke();
         }
+
+        let aUnitedRegion = this.GetUnitedRegion();
+        oGraphicsPDF.DrawLockObjectRect(this.Lock.Get_Type(), aUnitedRegion.regions);
     };
 
     /**
@@ -391,6 +394,9 @@
 
             oGraphicsPDF.Stroke();
         }
+
+        let aUnitedRegion = this.GetUnitedRegion();
+        oGraphicsPDF.DrawLockObjectRect(this.Lock.Get_Type(), aUnitedRegion.regions);
     };
 
     /**
@@ -471,6 +477,9 @@
 
             oGraphicsPDF.Stroke();
         }
+
+        let aUnitedRegion = this.GetUnitedRegion();
+        oGraphicsPDF.DrawLockObjectRect(this.Lock.Get_Type(), aUnitedRegion.regions);
     };
 
     let CARET_SYMBOL = {
@@ -558,6 +567,9 @@
 
             oGraphicsPDF.Stroke();
         }
+
+        let aUnitedRegion = this.GetUnitedRegion();
+        oGraphicsPDF.DrawLockObjectRect(this.Lock.Get_Type(), aUnitedRegion.regions);
     };
     CAnnotationCaret.prototype.SetCaretSymbol = function(nType) {
         this._caretSymbol = nType;

diff --git a/pdf/src/annotations/text.js b/pdf/src/annotations/text.js
@@ -253,7 +253,14 @@
 
         oCtx.restore();
 
-        oGraphics.DrawLockObjectRect(this.Lock.Get_Type(), nX, nY, 20 / oDoc.Viewer.zoom, 20 / oDoc.Viewer.zoom);
+        let aRegions = [[
+            [nX + nWidth, nY],
+            [nX, nY],
+            [nX, nY + nHeight],
+            [nX + nWidth, nY + nHeight]
+        ]];
+
+        oGraphics.DrawLockObjectRect(this.Lock.Get_Type(), aRegions);
         //// draw rect
         // oGraphics.SetLineWidth(1);
         // oGraphics.SetStrokeStyle(0, 255, 255);

diff --git a/pdf/src/document.js b/pdf/src/document.js
@@ -5804,10 +5804,13 @@ var CPresentation = CPresentation || function(){};
                 if (false == [AscCommon.c_oAscLockTypes.kLockTypeMine, AscCommon.c_oAscLockTypes.kLockTypeNone].includes(oCurPageInfo.Lock.Type))
                     return true;
 
-                let selected_objects = oController.selectedObjects;
+                let selected_objects = oController.selectedObjects.slice();
                 if (oController.selection.groupSelection) {
                     selected_objects.push(oController.selection.groupSelection);
                 }
+                if (this.mouseDownAnnot) {
+                    selected_objects.push(this.mouseDownAnnot);
+                }
 
                 if (isRestrictionView) {
                     for (let i = 0; i < selected_objects.length; i++) {
@@ -5855,10 +5858,13 @@ var CPresentation = CPresentation || function(){};
             case AscCommon.changestype_2_Comment: {
                 let sCommentId = AdditionalData;
 
-                let selected_objects = oController.selectedObjects;
+                let selected_objects = oController.selectedObjects.slice();
                 if (oController.selection.groupSelection) {
                     selected_objects.push(oController.selection.groupSelection);
                 }
+                if (this.mouseDownAnnot) {
+                    selected_objects.push(this.mouseDownAnnot);
+                }
 
                 for (let i = 0; i < selected_objects.length; ++i) {
                     if (selected_objects[i].GetId() == sCommentId) {