Author: tmorgner
Date: 2011-04-28 06:26:28 -0500 (Thu, 28 Apr 2011)
New Revision: 13936
Modified:
libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/FormulaEditorDialog.java
libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/MultiplexFunctionParameterEditor.java
Log:
PRD-2903: Formula editor area and formula parameter area are now split by a JSplitPane. This way the dialog is a bit more dynamic. The parameter are still has a rigid minimum size.
Modified: libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/FormulaEditorDialog.java
===================================================================
--- libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/FormulaEditorDialog.java 2011-04-28 11:13:45 UTC (rev 13935)
+++ libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/FormulaEditorDialog.java 2011-04-28 11:26:28 UTC (rev 13936)
@@ -43,9 +43,11 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;
+import javax.swing.border.EmptyBorder;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
import javax.swing.event.DocumentEvent;
@@ -531,9 +533,10 @@
protected JPanel createContentPane()
{
- final JPanel functionPanel = new JPanel(new BorderLayout());
- functionPanel.add(functionParameterEditor.getEditorComponent(), BorderLayout.CENTER);
- functionPanel.add(buildFormulaTextPanel(), BorderLayout.SOUTH);
+ final JSplitPane functionPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+ functionPanel.setTopComponent(functionParameterEditor.getEditorComponent());
+ functionPanel.setBottomComponent(buildFormulaTextPanel());
+ functionPanel.setBorder(new EmptyBorder(0, 0, 0,0));
final JPanel formulaPanel = new JPanel(new BorderLayout());
formulaPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
Modified: libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/MultiplexFunctionParameterEditor.java
===================================================================
--- libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/MultiplexFunctionParameterEditor.java 2011-04-28 11:13:45 UTC (rev 13935)
+++ libraries/libformula-ui/trunk/source/org/pentaho/openformula/ui/MultiplexFunctionParameterEditor.java 2011-04-28 11:26:28 UTC (rev 13936)
@@ -62,7 +62,6 @@
panel.setLayout(new BorderLayout());
rootPanel = new JPanel();
- rootPanel.setBorder(BorderFactory.createBevelBorder(BevelBorder.LOWERED));
rootPanel.setLayout(new CardLayout());
rootPanel.add("2", panel);
rootPanel.add("1", Box.createRigidArea(new Dimension(650, 250)));
|