midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem opened with the refactoring of [ 1757088 ] Grid Collapse and Tab Group

This commit is contained in:
Carlos Ruiz 2007-12-18 04:43:11 +00:00
parent d10f57c561
commit db20340eb8
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/src/org/compiere/grid/VPanel.java
View File

@ -119,6 +119,8 @@ public final class VPanel extends CTabbedPane
private boolean m_hGapAdded = false; // only once private boolean m_hGapAdded = false; // only once
/** Previous Field Group Header */ /** Previous Field Group Header */
private String m_oldFieldGroup = null; private String m_oldFieldGroup = null;
/** Previous Field Group Type */
private String m_oldFieldGroupType = null;
//[ 1757088 ] //[ 1757088 ]
private java.util.Hashtable m_tablist = new java.util.Hashtable(); private java.util.Hashtable m_tablist = new java.util.Hashtable();
private java.util.Hashtable m_tabincludelist = new java.util.Hashtable(); private java.util.Hashtable m_tabincludelist = new java.util.Hashtable();
@ -199,6 +201,7 @@ public final class VPanel extends CTabbedPane
if (fieldGroup == "") if (fieldGroup == "")
{ {
fieldGroup = m_oldFieldGroup; fieldGroup = m_oldFieldGroup;
fieldGroupType = m_oldFieldGroupType;
} }
if (addGroup(fieldGroup, fieldGroupType)) // sets top if (addGroup(fieldGroup, fieldGroupType)) // sets top
@ -206,6 +209,7 @@ public final class VPanel extends CTabbedPane
else else
{ {
fieldGroup = m_oldFieldGroup; fieldGroup = m_oldFieldGroup;
fieldGroupType = m_oldFieldGroupType;
} }
if (sameLine) // Set line # if (sameLine) // Set line #
@ -302,6 +306,7 @@ public final class VPanel extends CTabbedPane
{ {
addTop(); addTop();
m_oldFieldGroup = ""; m_oldFieldGroup = "";
m_oldFieldGroupType = "";
} }
if (fieldGroup == null || fieldGroup.length() == 0 || fieldGroup.equals(m_oldFieldGroup)) if (fieldGroup == null || fieldGroup.length() == 0 || fieldGroup.equals(m_oldFieldGroup))
@ -331,9 +336,6 @@ public final class VPanel extends CTabbedPane
dummy.setName(m_tab.getName()); dummy.setName(m_tab.getName());
this.add(dummy); this.add(dummy);
m_tablist.put(fieldGroup, m_tab); m_tablist.put(fieldGroup, m_tab);
m_oldFieldGroup= fieldGroup;
return true;
} }
else if (fieldGroupType.equals(X_AD_FieldGroup.FIELDGROUPTYPE_Collapse)) else if (fieldGroupType.equals(X_AD_FieldGroup.FIELDGROUPTYPE_Collapse))
{ {
@ -358,8 +360,6 @@ public final class VPanel extends CTabbedPane
m_gbc.ipadx = 0; m_gbc.ipadx = 0;
m_main.add(GroupPaneContainer,m_gbc); m_main.add(GroupPaneContainer,m_gbc);
m_tablist.put(fieldGroup, m_tab); m_tablist.put(fieldGroup, m_tab);
m_oldFieldGroup = fieldGroup;
return true;
} }
else // Label or null else // Label or null
{ {
@ -372,18 +372,19 @@ public final class VPanel extends CTabbedPane
m_main.add(group, m_gbc); m_main.add(group, m_gbc);
// reset // reset
m_gbc.gridwidth = 1; m_gbc.gridwidth = 1;
m_oldFieldGroup = fieldGroup;
return true;
} }
m_oldFieldGroup = fieldGroup;
m_oldFieldGroupType = fieldGroupType;
return true;
} // addGroup } // addGroup
private JXTaskPaneContainer createTaskPaneContainer() { private JXTaskPaneContainer createTaskPaneContainer() {
Color c = AdempierePLAF.getFormBackground(); Color c = AdempierePLAF.getFormBackground();
Color containerBg = new Color(Math.max((int)(c.getRed() * 0.97), 0), Color containerBg = new Color(Math.max((int)(c.getRed() * 0.97), 0),
Math.max((int)(c.getGreen()*0.97), 0), Math.max((int)(c.getGreen()*0.97), 0),
Math.max((int)(c.getBlue() *0.97), 0)); Math.max((int)(c.getBlue() *0.97), 0));
JXTaskPaneContainer GroupPaneContainer = new JXTaskPaneContainer(); JXTaskPaneContainer GroupPaneContainer = new JXTaskPaneContainer();
GroupPaneContainer.setBackground(containerBg); GroupPaneContainer.setBackground(containerBg);
return GroupPaneContainer; return GroupPaneContainer;
} }