From 4f3b56d41cdcf7c6273911d9d0b1ab7686dda48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20T=C3=A2che?= <tga@bger.ch>
Date: Fri, 22 Dec 2023 15:36:52 +0100
Subject: [PATCH] GH-328 Allows setting default width and height of popup and
 uses the same values for all the annotations

---
 .../ri/common/tools/CircleAnnotationHandler.java      |  2 +-
 .../ri/common/tools/HighLightAnnotationHandler.java   |  2 +-
 .../icepdf/ri/common/tools/InkAnnotationHandler.java  |  2 +-
 .../icepdf/ri/common/tools/LineAnnotationHandler.java |  2 +-
 .../ri/common/tools/SquareAnnotationHandler.java      |  2 +-
 .../icepdf/ri/common/tools/TextAnnotationHandler.java |  4 ++--
 .../views/annotations/PopupAnnotationComponent.java   | 11 +++++------
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/CircleAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/CircleAnnotationHandler.java
index 8e7095e17..07ac89b4d 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/CircleAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/CircleAnnotationHandler.java
@@ -219,7 +219,7 @@ public void mouseReleased(MouseEvent e) {
         // associate popup to location
         PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
         popupAnnotationComponent.setBoundsRelativeToParent(
-                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2), pageTransform);
+                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2));
         popupAnnotationComponent.setVisible(false);
         popupAnnotationComponent.getAnnotation().setOpen(false);
 
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/HighLightAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/HighLightAnnotationHandler.java
index 410034f93..670cce244 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/HighLightAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/HighLightAnnotationHandler.java
@@ -202,7 +202,7 @@ public void createTextMarkupAnnotation(ArrayList<Shape> highlightBounds) {
             // associate popup to location
             PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
             popupAnnotationComponent.setBoundsRelativeToParent(
-                    bounds.x + bounds.width / 2, bounds.y + bounds.height / 2, pageTransform);
+                    bounds.x + bounds.width / 2, bounds.y + bounds.height / 2);
             popupAnnotationComponent.setVisible(false);
             popupAnnotationComponent.getAnnotation().setOpen(false);
 
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/InkAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/InkAnnotationHandler.java
index aa3d101ec..b0a62d0f9 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/InkAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/InkAnnotationHandler.java
@@ -236,7 +236,7 @@ protected void buildInkAnnotation() {
         // associate popup to location
         PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
         popupAnnotationComponent.setBoundsRelativeToParent(
-                bBox.x + (bBox.width / 2), bBox.y + (bBox.height / 2), pageTransform);
+                bBox.x + (bBox.width / 2), bBox.y + (bBox.height / 2));
         popupAnnotationComponent.setVisible(false);
         popupAnnotationComponent.getAnnotation().setOpen(false);
 
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/LineAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/LineAnnotationHandler.java
index e9e0f39a2..b2163a1ef 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/LineAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/LineAnnotationHandler.java
@@ -223,7 +223,7 @@ public void mouseReleased(MouseEvent e) {
         // associate popup to location
         PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
         popupAnnotationComponent.setBoundsRelativeToParent(
-                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2), pageTransform);
+                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2));
         popupAnnotationComponent.setVisible(false);
         popupAnnotationComponent.getAnnotation().setOpen(false);
 
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/SquareAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/SquareAnnotationHandler.java
index cf780df06..db6ca34a1 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/SquareAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/SquareAnnotationHandler.java
@@ -230,7 +230,7 @@ public void mouseReleased(MouseEvent e) {
         // associate popup to location
         PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
         popupAnnotationComponent.setBoundsRelativeToParent(
-                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2), pageTransform);
+                bbox.x + (bbox.width / 2), bbox.y + (bbox.height / 2));
         popupAnnotationComponent.setVisible(false);
         popupAnnotationComponent.getAnnotation().setOpen(false);
 
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/TextAnnotationHandler.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/TextAnnotationHandler.java
index 2fde49942..9f2150ec7 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/TextAnnotationHandler.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/tools/TextAnnotationHandler.java
@@ -210,8 +210,8 @@ public void mouseReleased(MouseEvent e) {
         PopupAnnotationComponent popupAnnotationComponent = comp.getPopupAnnotationComponent();
         popupAnnotationComponent.setBoundsRelativeToParent(
                 e.getX() + scaledSize.width / 2,
-                e.getY() + scaledSize.height / 2,
-                pageInverseTransform);
+                e.getY() + scaledSize.height / 2
+        );
         popupAnnotationComponent.setVisible(true);
         popupAnnotationComponent.getAnnotation().setOpen(true);
         popupAnnotationComponent.focusTextArea();
diff --git a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java
index 9aa484bb1..91d9774c0 100644
--- a/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java
+++ b/viewer/viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java
@@ -22,6 +22,7 @@
 import org.icepdf.core.pobjects.annotations.MarkupAnnotation;
 import org.icepdf.core.pobjects.annotations.PopupAnnotation;
 import org.icepdf.core.pobjects.annotations.TextAnnotation;
+import org.icepdf.core.util.Defs;
 import org.icepdf.core.util.PropertyConstants;
 import org.icepdf.core.util.SystemProperties;
 import org.icepdf.ri.common.ViewModel;
@@ -83,8 +84,8 @@ public class PopupAnnotationComponent extends AbstractAnnotationComponent<PopupA
         implements TreeSelectionListener, ActionListener, DocumentListener, PropertyChangeListener, MouseWheelListener,
         DropTargetListener, PageViewAnnotationComponent {
 
-    public static final int DEFAULT_WIDTH = 215;
-    public static final int DEFAULT_HEIGHT = 150;
+    public static final int DEFAULT_WIDTH = Defs.sysPropertyInt("org.icepdf.ri.popup.width.default", 215);
+    public static final int DEFAULT_HEIGHT = Defs.sysPropertyInt("org.icepdf.ri.popup.height.default", 150);
     public static final Color backgroundColor = new Color(252, 253, 227);
     public static final Dimension BUTTON_SIZE = new Dimension(22, 22);
 
@@ -472,12 +473,10 @@ public void focusTextArea() {
         textArea.setCaretPosition(textArea.getDocument().getLength());
     }
 
-    public void setBoundsRelativeToParent(int x, int y, AffineTransform pageInverseTransform) {
+    public void setBoundsRelativeToParent(int x, int y) {
         Rectangle pageBounds = pageViewComponent.getParent().getBounds();
         // position the new popup on the icon center.
-        Rectangle bBox2 = new Rectangle(x, y,
-                (int) Math.abs(DEFAULT_WIDTH * pageInverseTransform.getScaleX()),
-                (int) Math.abs(DEFAULT_HEIGHT * pageInverseTransform.getScaleY()));
+        Rectangle bBox2 = new Rectangle(x, y, Math.abs(DEFAULT_WIDTH), Math.abs(DEFAULT_HEIGHT));
 
         // add page offset
         bBox2.x += pageBounds.x;