This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 51c34317b040b7d3d2e209c10a6852db9671cb80 Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 28 15:09:02 2020 +0200 Fixes #10746 : Suprression de la MAJ automatique de la position du curseur -> il reste toujours en haut par défaut --- .../faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx index ce61164a..af1908ac 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUI.jaxx @@ -147,7 +147,7 @@ orientation="{JSplitPane.VERTICAL_SPLIT}" constraints='BorderLayout.CENTER'> - <JScrollPane> + <JScrollPane id="messageScrollPane"> <JTextPane id="message" onKeyReleased='handler.setText(event, "message")'/> </JScrollPane> diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 42290d7e..9cb38afa 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -32,7 +32,6 @@ import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.SigningForDomain; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; -import com.franciaflex.faxtomail.services.service.EmailServiceImpl; import com.franciaflex.faxtomail.services.service.ldap.Contact; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.reply.actions.AddAttachmentToReplyAction; @@ -58,6 +57,8 @@ import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.text.DefaultCaret; +import javax.swing.text.JTextComponent; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; @@ -118,8 +119,15 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo public void afterInit(final ReplyFormUI ui) { initUI(ui); + // Turn off automatic scrolling for message cf. #10746 + Component view = ui.getMessageScrollPane().getViewport().getView(); + if (view instanceof JTextComponent) { + JTextComponent textComponent = (JTextComponent)view; + DefaultCaret caret = (DefaultCaret)textComponent.getCaret(); + caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE); + } + JTextPane editor = ui.getMessage(); - editor.setCaretPosition(0); editor.setContentType("text/html"); @@ -272,7 +280,6 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo ReplyFormUIModel model = (ReplyFormUIModel) evt.getSource(); if (!model.isReadonly()) { getContext().getActionEngine().runAction(senderChangedAction); - ui.getMessage().setCaretPosition(0); } } }); @@ -294,7 +301,6 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo } }); - } protected boolean addAttchmentToReply(DemandeUIModel demand, ReplyFormUIModel model, DemandeUIModel demandeUIModel, Attachment attachment) { @@ -541,9 +547,6 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo originalReply); replyModel.setMessage(quotedReply); - //Set caret to top position, cf. #10746 - dialogContent.getMessage().setCaretPosition(0); - openModalFrame(dialogContent, replyModel.getSubject(), new Dimension(800, 600)); } catch (Exception ex) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.