Merge changes from release-1.0c branch

This commit is contained in:
Heng Sin Low 2013-08-20 15:50:28 +08:00
commit 29bb281f6a
1 changed files with 17 additions and 13 deletions

View File

@ -471,20 +471,24 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace, IFi
if (headerWidth > estimatedWidth) if (headerWidth > estimatedWidth)
estimatedWidth = headerWidth; estimatedWidth = headerWidth;
if (DisplayType.isLookup(gridField[i].getDisplayType())) //hflex=min for first column not working well
if (i > 0)
{ {
if (headerWidth > MIN_COMBOBOX_WIDTH) if (DisplayType.isLookup(gridField[i].getDisplayType()))
column.setHflex("min"); {
} if (headerWidth > MIN_COMBOBOX_WIDTH)
else if (DisplayType.isNumeric(gridField[i].getDisplayType())) column.setHflex("min");
{ }
if (headerWidth > MIN_NUMERIC_COL_WIDTH) else if (DisplayType.isNumeric(gridField[i].getDisplayType()))
column.setHflex("min"); {
} if (headerWidth > MIN_NUMERIC_COL_WIDTH)
else if (!DisplayType.isText(gridField[i].getDisplayType())) column.setHflex("min");
{ }
if (headerWidth > MIN_COLUMN_WIDTH) else if (!DisplayType.isText(gridField[i].getDisplayType()))
column.setHflex("min"); {
if (headerWidth > MIN_COLUMN_WIDTH)
column.setHflex("min");
}
} }
//set estimated width if not using hflex=min //set estimated width if not using hflex=min