[bug] fix scale in mobile view

ONLYOFFICE · Feb 3, 2025 · 4f43d3e · 4f43d3e
1 parent be6ade6
commit 4f43d3e
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 3 deletions.
diff --git a/common/apiBase.js b/common/apiBase.js
@@ -5195,7 +5195,7 @@
         return this.canRemoveAllInks();
 	};
 	baseEditorsApi.prototype.canRemoveAllInks = function() {
-        return true;
+        return this.haveInks();
 	};
 	baseEditorsApi.prototype.stopInkDrawer = function() {
 		this.inkDrawer.turnOff();

diff --git a/slide/Drawing/Transitions.js b/slide/Drawing/Transitions.js
@@ -3821,7 +3821,14 @@ function CDemonstrationManager(htmlpage)
 			}
 			case 27:    // escape
 			{
-				oThis.End();
+                if(Asc.editor.isInkDrawerOn())
+                {
+                    Asc.editor.stopInkDrawer();
+                }
+                else
+                {
+                    Asc.editor.EndDemonstration();
+                }
 				break;
 			}
 			case 48: // 0

diff --git a/word/Editor/Document.js b/word/Editor/Document.js
@@ -6331,6 +6331,14 @@ CDocument.prototype.PutImageToSelection = function(sImageSrc, nWidth, nHeight, r
     return this.DrawingObjects.putImageToSelection(sImageSrc, nWidth, nHeight, replaceMode);
 
 };
+CDocument.prototype.RemoveAllInks = function()
+{
+    return this.DrawingObjects.removeAllInks();
+};
+CDocument.prototype.HaveInks = function()
+{
+    return this.DrawingObjects.haveInks();
+};
 /**
  * Добавляем таблицу в текущую позицию курсора
  * @param {number} nCols

diff --git a/word/Editor/GraphicObjects/GraphicObjects.js b/word/Editor/GraphicObjects/GraphicObjects.js
@@ -429,6 +429,42 @@ CGraphicObjects.prototype =
     createWatermarkImage: DrawingObjectsController.prototype.createWatermarkImage,
 
 
+    getAllInksDrawings: function ()
+    {
+        let aDrawings = this.document.GetAllDrawingObjects();
+        let aInksDrawings = [];
+        for(let nIdx = 0; nIdx < aDrawings.length; ++nIdx)
+        {
+            let oDrawing = aDrawings[nIdx];
+            if(oDrawing.GraphicObj.isInk())
+            {
+                aInksDrawings.push(oDrawing);
+            }
+        }
+        return aInksDrawings;
+    },
+    haveInks: function ()
+    {
+        return this.getAllInksDrawings().length > 0;
+    },
+    removeAllInks: function ()
+    {
+        let aInksDrawings = this.getAllInksDrawings();
+        if(aInksDrawings.length > 0)
+        {
+            this.document.StartAction(0);
+            for(let nIdx = 0; nIdx < aInksDrawings.length; ++nIdx)
+            {
+                let oDrawing = aInksDrawings[nIdx];
+                oDrawing.Remove_FromDocument(false);
+                this.deselectObject(oDrawing.GraphicObj);
+            }
+            this.document.Recalculate();
+            this.document.FinalizeAction();
+        }
+    },
+
+
     createWatermark: function(oProps)
     {
         if(oProps.get_Type() === Asc.c_oAscWatermarkType.None)

diff --git a/word/Editor/Paragraph/ParaDrawing.js b/word/Editor/Paragraph/ParaDrawing.js
@@ -1151,7 +1151,9 @@ ParaDrawing.prototype.CheckWH = function()
 		extY = 5;
 		rot = 0;
 	}
-	this.setExtent(extX, extY);
+
+	let dKoef = this.GetScaleCoefficient();
+	this.setExtent(extX / dKoef, extY / dKoef);
 
 
 	var EEL = 0.0, EET = 0.0, EER = 0.0, EEB = 0.0;

diff --git a/word/api.js b/word/api.js
@@ -13595,6 +13595,20 @@ background-repeat: no-repeat;\
 		return bReset;
 	};
 
+	asc_docs_api.prototype.removeAllInks = function()
+	{
+		let oLogicDocument = this.getLogicDocument();
+		if(!oLogicDocument) return;
+		return oLogicDocument.RemoveAllInks();
+	};
+
+
+	asc_docs_api.prototype.haveInks = function() {
+		let oLogicDocument = this.getLogicDocument();
+		if(!oLogicDocument) return;
+		return oLogicDocument.HaveInks();
+	};
+
 	asc_docs_api.prototype.onUpdateRestrictions = function(restrictionSettings)
 	{
 		if (this.WordControl)