This is an automated email from the git hooks/post-receive script. New commit to branch feature/9962_Erreur_rotation_des_documents in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit b8a4d40b4201af1cf804f723424d76eeae3127db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Jun 12 14:38:07 2018 +0200 refs #9962 : Erreur rotation des documents --- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 11 ++--------- .../franciaflex/faxtomail/ui/swing/util/JImagePanel.java | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 8779855a..a1f8fd35 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -92,7 +92,6 @@ import javax.swing.tree.TreeModel; import java.awt.Color; import java.awt.Component; import java.awt.Desktop; -import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; @@ -1013,10 +1012,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { JImagePanel imagePanel = new JImagePanel(); int maxWidth = config.getMaxWidthImageInTextPane(); - if (maxWidth > 0) { - Dimension maximumSize = new Dimension(maxWidth, imagePanel.getMaximumSize().height); - imagePanel.setMaximumSize(maximumSize); - } + imagePanel.setMaxWidth(maxWidth); imagePanel.setScaleImageToFitPanel(true); imagePanel.setImage(awtImage); @@ -1039,10 +1035,7 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { JImagePanel imagePanel = new JImagePanel(); int maxWidth = config.getMaxWidthImageInTextPane(); - if (maxWidth > 0) { - Dimension maximumSize = new Dimension(maxWidth, imagePanel.getMaximumSize().height); - imagePanel.setMaximumSize(maximumSize); - } + imagePanel.setMaxWidth(maxWidth); imagePanel.setScaleImageToFitPanel(true); imagePanel.setImage(originalFile); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java index 2cff8509..76657a93 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java @@ -48,6 +48,8 @@ public class JImagePanel extends JPanel { protected Image image; protected Image scaledImage; protected int rotation = 0; + protected int maxWidth = 0; + protected boolean scaleImageToFitPanel; @@ -70,6 +72,14 @@ public class JImagePanel extends JPanel { this.rotation = rotation; } + public int getMaxWidth() { + return maxWidth; + } + + public void setMaxWidth(int maxWidth) { + this.maxWidth = maxWidth; + } + public boolean isScaleImageToFitPanel() { return scaleImageToFitPanel; } @@ -116,9 +126,9 @@ public class JImagePanel extends JPanel { int newWidth = rotation % 180 == 0 ? srcWidth : srcHeight; int newHeight = rotation % 180 == 0 ? srcHeight : srcWidth; - if (newWidth > getMaximumSize().width) { - newHeight = newHeight * getMaximumSize().width / newWidth; - newWidth = getMaximumSize().width; + if (getMaxWidth() > 0 && newWidth > getMaxWidth()) { + newHeight = newHeight * getMaxWidth() / newWidth; + newWidth = getMaxWidth(); scaledImage = image.getScaledInstance(newWidth, newHeight, Image.SCALE_SMOOTH); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.