GH-314 fix markup annotation popup placement regression.

pcorless · Jan 30, 2024 · 7975324 · 7975324
1 parent 7079cd1
commit 7975324
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/MarkupGlueComponent.java b/.../viewer-awt/src/main/java/org/icepdf/ri/common/views/annotations/MarkupGlueComponent.java
@@ -76,7 +76,7 @@ private Rectangle recalculateAnnotationBounds() {
         Rectangle2D markupUserSpaceRectangle = markupAnnotationComponent.getAnnotation().getUserSpaceRectangle();
         Rectangle annotationPageSpaceBounds =
                 Annotation.commonBoundsNormalization(new GeneralPath(markupUserSpaceRectangle), at);
-        Rectangle pageBounds = parentPageViewComponent.getBounds();
+        Rectangle pageBounds = parentPageViewComponent.getParent().getBounds();
         annotationPageSpaceBounds.x += pageBounds.x;
         annotationPageSpaceBounds.y += pageBounds.y;
         return annotationPageSpaceBounds;

diff --git a/...er-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java b/...er-awt/src/main/java/org/icepdf/ri/common/views/annotations/PopupAnnotationComponent.java
@@ -172,7 +172,7 @@ public void refreshDirtyBounds() {
                 documentViewModel.getPageBoundary(),
                 documentViewModel.getViewRotation(),
                 documentViewModel.getViewZoom());
-        Rectangle pageBounds = parentPageViewComponent.getBounds();
+        Rectangle pageBounds = parentPageViewComponent.getParent().getBounds();
         annotationPageSpaceBounds.x += pageBounds.x;
         annotationPageSpaceBounds.y += pageBounds.y;
         setBounds(annotationPageSpaceBounds);
@@ -194,7 +194,7 @@ public void refreshAnnotationRect() {
                 documentViewModel.getPageBoundary(),
                 documentViewModel.getViewRotation(),
                 documentViewModel.getViewZoom());
-        Rectangle pageBounds = parentPageViewComponent.getBounds();
+        Rectangle pageBounds = parentPageViewComponent.getParent().getBounds();
         Rectangle bounds = getBounds();
         bounds.x -= pageBounds.x;
         bounds.y -= pageBounds.y;
@@ -517,7 +517,7 @@ public void replyToSelectedMarkupExecute() {
     }
 
     public AnnotationComponent getAnnotationParentComponent() {
-        return findAnnotationComponent(selectedMarkupAnnotation);
+        return findAnnotationComponent(annotation.getParent());
     }
 
     /**