From 52bbbc307fb0e887199095dc68f9632d1ac4723e Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Mon, 26 Mar 2007 04:48:14 +0000 Subject: [PATCH] * [ 1686486 ] ProcessDialog truncates display of log --- .../src/org/compiere/apps/ProcessDialog.java | 22 ++++++++++++++++--- .../org/compiere/apps/ProcessModalDialog.java | 17 ++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/client/src/org/compiere/apps/ProcessDialog.java b/client/src/org/compiere/apps/ProcessDialog.java index e7a2192872..6411b31f28 100644 --- a/client/src/org/compiere/apps/ProcessDialog.java +++ b/client/src/org/compiere/apps/ProcessDialog.java @@ -114,7 +114,20 @@ public class ProcessDialog extends CFrame return d; } }; - private JScrollPane messagePane = new JScrollPane(message); + private JScrollPane messagePane = new JScrollPane(message) + { + public Dimension getPreferredSize() { + Dimension d = super.getPreferredSize(); + Dimension m = getMaximumSize(); + if ( d.height > m.height || d.width > m.width ) { + Dimension d1 = new Dimension(); + d1.height = Math.min(d.height, m.height); + d1.width = Math.min(d.width, m.width); + return d1; + } else + return d; + } + }; private CButton bPrint = ConfirmPanel.createPrintButton(true); private CPanel centerPanel = null; @@ -147,7 +160,7 @@ public class ProcessDialog extends CFrame southPanel.add(bOK, null); dialog.add(messagePane, BorderLayout.NORTH); messagePane.setBorder(null); - message.setMaximumSize(new Dimension(600, 300)); + messagePane.setMaximumSize(new Dimension(600, 300)); centerPanel = new CPanel(); centerPanel.setBorder(null); centerPanel.setLayout(new BorderLayout()); @@ -319,7 +332,10 @@ public class ProcessDialog extends CFrame //no longer needed, hide to give more space to display log parameterPanel.setVisible(false); - this.pack(); + messagePane.setMaximumSize(null); + + this.validate(); + AEnv.showCenterScreen(this); // afterProcessTask(); // Close automatically diff --git a/client/src/org/compiere/apps/ProcessModalDialog.java b/client/src/org/compiere/apps/ProcessModalDialog.java index a37f98e2e7..4b099d4c42 100644 --- a/client/src/org/compiere/apps/ProcessModalDialog.java +++ b/client/src/org/compiere/apps/ProcessModalDialog.java @@ -124,7 +124,20 @@ public class ProcessModalDialog extends CDialog return d; } }; - private JScrollPane messagePane = new JScrollPane(message); + private JScrollPane messagePane = new JScrollPane(message) + { + public Dimension getPreferredSize() { + Dimension d = super.getPreferredSize(); + Dimension m = getMaximumSize(); + if ( d.height > m.height || d.width > m.width ) { + Dimension d1 = new Dimension(); + d1.height = Math.min(d.height, m.height); + d1.width = Math.min(d.width, m.width); + return d1; + } else + return d; + } + }; private CPanel centerPanel = null; private ProcessParameterPanel parameterPanel = null; @@ -150,7 +163,7 @@ public class ProcessModalDialog extends CDialog dialog.add(southPanel, BorderLayout.SOUTH); dialog.add(messagePane, BorderLayout.NORTH); messagePane.setBorder(null); - message.setMaximumSize(new Dimension(600, 300)); + messagePane.setMaximumSize(new Dimension(600, 300)); centerPanel = new CPanel(); centerPanel.setBorder(null); centerPanel.setLayout(new BorderLayout());