diff options
author | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-10-07 13:59:02 +0200 |
---|---|---|
committer | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-10-07 13:59:02 +0200 |
commit | e62af8986381d22aeea52c48276611777632da6c (patch) | |
tree | 092aa932b05b5c91b2ad21c44e5285ca1edb320e /pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java | |
parent | acb42081141d476b1cd0c1ddf1eca0e07786e43e (diff) | |
download | pdf-over-e62af8986381d22aeea52c48276611777632da6c.tar.gz pdf-over-e62af8986381d22aeea52c48276611777632da6c.tar.bz2 pdf-over-e62af8986381d22aeea52c48276611777632da6c.zip |
position composite rewrite
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java')
-rw-r--r-- | pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java index 1953a035..9f90cbbc 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java @@ -235,12 +235,12 @@ public class PositioningComposite extends StateComposite { case KeyEvent.VK_UP: case KeyEvent.VK_KP_UP: - sigYOffset -= Constants.SIGNATURE_KEYBOARD_POSITIONING_OFFSET; + sigYOffset += Constants.SIGNATURE_KEYBOARD_POSITIONING_OFFSET; break; case KeyEvent.VK_DOWN: case KeyEvent.VK_KP_DOWN: - sigYOffset += Constants.SIGNATURE_KEYBOARD_POSITIONING_OFFSET; + sigYOffset -= Constants.SIGNATURE_KEYBOARD_POSITIONING_OFFSET; break; } @@ -335,11 +335,11 @@ public class PositioningComposite extends StateComposite { * @param sigXOffset * signature placeholder horizontal position offset * @param sigYOffset - * signature placeholder vertical position offset + * signature placeholder vertical position offset (negative is down) */ public void translateSignaturePosition(final int sigXOffset, final int sigYOffset) { EventQueue.invokeLater(() -> { - this.viewer.translateSignaturePosition(sigXOffset, sigYOffset); + this.viewer.translateSignaturePagePosition(sigXOffset, sigYOffset); }); } @@ -350,12 +350,14 @@ public class PositioningComposite extends StateComposite { * the signature position */ void setFinalPosition() { - if (this.currentPage == 0) + if (this.currentPage == 0) { this.position = new SignaturePosition(); - else + } else { this.position = new SignaturePosition( - this.viewer.getSignaturePositionX(), - this.viewer.getSignaturePositionY(), this.currentPage); + this.viewer.getSigPageX(), + this.viewer.getSigPageY(), + this.currentPage); + } PositioningComposite.this.state.updateStateMachine(); } @@ -369,7 +371,7 @@ public class PositioningComposite extends StateComposite { * @param page * the page the signature is on */ - public void setPosition(float x, float y, int page) { + public void setPosition(double x, double y, int page) { showPage(page); if (this.viewer != null) this.viewer.setSignaturePosition(x, y); |