From 35671127d99ffbb8e3fc919fbf7f9364568eb64f Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Tue, 19 Jul 2022 17:33:26 +0200
Subject: [PATCH] [Editor] Ink editor was too much translated after commit

The problem is clearly visible when the thickness is at max.
It's mainly because the thickness was not taken into account when
translating the div but it was when the line is drawn on the canvas.
---
 src/display/editor/ink.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/display/editor/ink.js b/src/display/editor/ink.js
index 1767d8941..3d146df41 100644
--- a/src/display/editor/ink.js
+++ b/src/display/editor/ink.js
@@ -154,11 +154,11 @@ class InkEditor extends AnnotationEditor {
     this.parent.addCommands({
       cmd: () => {
         this.thickness = thickness;
-        this.#fitToContent();
+        this.#fitToContent(/* thicknessChanged = */ true);
       },
       undo: () => {
         this.thickness = savedThickness;
-        this.#fitToContent();
+        this.#fitToContent(/* thicknessChanged = */ true);
       },
       mustExec: true,
       type: AnnotationEditorParamsType.INK_THICKNESS,
@@ -828,7 +828,9 @@ class InkEditor extends AnnotationEditor {
    * @returns {number}
    */
   #getPadding() {
-    return Math.ceil(this.thickness * this.parent.scaleFactor);
+    return this.#disableEditing
+      ? Math.ceil(this.thickness * this.parent.scaleFactor)
+      : 0;
   }
 
   /**
@@ -836,7 +838,7 @@ class InkEditor extends AnnotationEditor {
    * the bounding box of the contents.
    * @returns {undefined}
    */
-  #fitToContent() {
+  #fitToContent(thicknessChanged = false) {
     if (this.isEmpty()) {
       return;
     }
@@ -848,8 +850,8 @@ class InkEditor extends AnnotationEditor {
 
     const bbox = this.#getBbox();
     const padding = this.#getPadding();
-    this.#baseWidth = bbox[2] - bbox[0];
-    this.#baseHeight = bbox[3] - bbox[1];
+    this.#baseWidth = Math.max(RESIZER_SIZE, bbox[2] - bbox[0]);
+    this.#baseHeight = Math.max(RESIZER_SIZE, bbox[3] - bbox[1]);
 
     const width = Math.ceil(padding + this.#baseWidth * this.scaleFactor);
     const height = Math.ceil(padding + this.#baseHeight * this.scaleFactor);
@@ -880,9 +882,12 @@ class InkEditor extends AnnotationEditor {
     this.#realHeight = height;
 
     this.setDims(width, height);
+    const unscaledPadding = thicknessChanged
+      ? 0
+      : padding / this.scaleFactor / 2;
     this.translate(
-      prevTranslationX - this.translationX,
-      prevTranslationY - this.translationY
+      prevTranslationX - this.translationX - unscaledPadding,
+      prevTranslationY - this.translationY - unscaledPadding
     );
   }