projects/dwt-addons: dwtx/ui/forms/widgets/TableWrapLayout.d comparison

comparison dwtx/ui/forms/widgets/TableWrapLayout.d @ 104:04b47443bb01

Reworked the collection uses to make use of a wrapper collection that is compatible to the Java Collections. These new wrappers now use the tango.util.containers instead of the tango.util.collections.

author	Frank Benoit <benoit@tionex.de>
date	Thu, 07 Aug 2008 15:01:33 +0200
parents	56fea7e5f0f9
children	8df1d4193877

comparison

equal deleted inserted replaced

-:2d6540440fe6
+:04b47443bb01
 import dwt.widgets.Composite;
 import dwt.widgets.Control;
 import dwt.widgets.Layout;
 import dwt.dwthelper.utils;
-import tango.util.collection.ArraySeq;
+import dwtx.dwtxhelper.Collection;
-import tango.util.collection.HashMap;
 /**
 * This implementation of the layout algorithm attempts to position controls in
 * the composite using a two-pass autolayout HTML table altorithm recommeded by
 * HTML 4.01 W3C specification (see
 */
 public bool makeColumnsEqualWidth = false;
 private bool initialLayout = true;
-private ArraySeq!(Object) grid = null;
+private Vector grid = null;
-private HashMap!(Object,Object) rowspans;
+private Hashtable rowspans;
 private int[] minColumnWidths, maxColumnWidths;
 private int widestColumnWidth;
 changed = true;
 initialLayout = false;
 }
 if (grid is null || changed) {
 changed = true;
-grid = new ArraySeq!(Object);
+grid = new Vector();
 createGrid(parent);
 }
 if (minColumnWidths is null)
 minColumnWidths = new int[numColumns];
 for (int i = 0; i < numColumns; i++) {
 changed = true;
 initialLayout = false;
 }
 if (grid is null || changed) {
 changed = true;
-grid = new ArraySeq!(Object);
+grid = new Vector();
 createGrid(parent);
 }
 if (maxColumnWidths is null)
 maxColumnWidths = new int[numColumns];
 for (int i = 0; i < numColumns; i++) {
 changed = true;
 initialLayout = false;
 }
 if (grid is null || changed) {
 changed = true;
-grid = new ArraySeq!(Object);
+grid = new Vector();
 createGrid(parent);
 }
 resetColumnWidths();
 int minWidth = internalGetMinimumWidth(parent, changed);
 int maxWidth = internalGetMaximumWidth(parent, changed);
 int y = topMargin+clientArea.y;
 int[] rowHeights = computeRowHeights(children, columnWidths, changed);
 for (int i = 0; i < grid.size(); i++) {
 int rowHeight = rowHeights[i];
 int x = leftMargin+clientArea.x;
-TableWrapData[] row = (cast(ArrayWrapperT!(TableWrapData)) grid.get(i)).array;
+TableWrapData[] row = arrayFromObject!(TableWrapData)( grid.elementAt(i));
 for (int j = 0; j < numColumns; j++) {
 TableWrapData td = row[j];
 if (td.isItemData) {
 Control child = children[td.childIndex];
 placeControl(child, td, x, y, rowHeights, i);
 int[] computeRowHeights(Control[] children, int[] columnWidths,
 bool changed) {
 int[] rowHeights = new int[grid.size()];
 for (int i = 0; i < grid.size(); i++) {
-TableWrapData[] row = (cast(ArrayWrapperT!(TableWrapData)) grid.get(i)).array;
+TableWrapData[] row = arrayFromObject!(TableWrapData)( grid.elementAt(i));
 rowHeights[i] = 0;
 for (int j = 0; j < numColumns; j++) {
 TableWrapData td = row[j];
 if (td.isItemData is false) {
 continue;
 td.compWidth = cwidth;
 if (td.heightHint !is DWT.DEFAULT) {
 size = new Point(size.x, td.heightHint);
 }
 td.compSize = size;
-RowSpan rowspan = rowspans.containsKey(child) ? cast(RowSpan) rowspans.get(child) : null;
+RowSpan rowspan = cast(RowSpan) rowspans.get(child);
 if (rowspan is null) {
 rowHeights[i] = Math.max(rowHeights[i], size.y);
 } else
 rowspan.height = size.y;
 }
 updateRowSpans(i, rowHeights[i]);
 }
-foreach( k, v; rowspans ){
+for (Enumeration enm = rowspans.elements(); enm.hasMoreElements();) {
-RowSpan rowspan = cast(RowSpan) v;
+RowSpan rowspan = cast(RowSpan) enm.nextElement();
 int increase = rowspan.getRequiredHeightIncrease();
 if (increase is 0)
 continue;
 TableWrapData td = cast(TableWrapData) rowspan.child.getLayoutData();
 int ngrowing = 0;
 int height = td.compSize.y;
 int colWidth = td.compWidth - td.indent;
 int width = td.compSize.x-td.indent;
 width = Math.min(width, colWidth);
 int slotHeight = rowHeights[row];
-RowSpan rowspan = rowspans.containsKey(control) ? cast(RowSpan) rowspans.get(control) : null;
+RowSpan rowspan = cast(RowSpan) rowspans.get(control);
 if (rowspan !is null) {
 slotHeight = 0;
 for (int i = row; i < row + td.rowspan; i++) {
 if (i > row)
 slotHeight += verticalSpacing;
 void createGrid(Composite composite) {
 int row, column, rowFill, columnFill;
 Control[] children;
 TableWrapData spacerSpec;
-ArraySeq!(Object) growingCols = new ArraySeq!(Object);
+Vector growingCols = new Vector();
-ArraySeq!(Object) growingRows = new ArraySeq!(Object);
+Vector growingRows = new Vector();
-rowspans = new HashMap!(Object,Object);
+rowspans = new Hashtable();
 //
 children = composite.getChildren();
 if (children.length is 0)
 return;
 //
-grid.append( new ArrayWrapperT!(TableWrapData)(createEmptyRow()));
+grid.addElement( new ArrayWrapperObject(createEmptyRow()));
 row = 0;
 column = 0;
 // Loop through the children and place their associated layout specs in
 // the
 // grid. Placement occurs left to right, top to bottom (i.e., by row).
 for (int i = 0; i < children.length; i++) {
 // Find the first available spot in the grid.
 Control child = children[i];
 TableWrapData spec = cast(TableWrapData) child.getLayoutData();
-while ((cast(ArrayWrapperT!(TableWrapData)) grid.get(row)).array[column] !is null) {
+while (arrayFromObject!(TableWrapData)( grid.elementAt(row))[column] !is null) {
 column = column + 1;
 if (column >= numColumns) {
 row = row + 1;
 column = 0;
 if (row >= grid.size()) {
-grid.append(new ArrayWrapperT!(TableWrapData)(createEmptyRow()));
+grid.addElement(new ArrayWrapperObject(createEmptyRow()));
 }
 }
 }
 // See if the place will support the widget's horizontal span. If
 // not, go to the
 // next row.
 if (column + spec.colspan - 1 >= numColumns) {
-grid.append(new ArrayWrapperT!(TableWrapData)(createEmptyRow()));
+grid.addElement(new ArrayWrapperObject(createEmptyRow()));
 row = row + 1;
 column = 0;
 }
 // The vertical span for the item will be at least 1. If it is > 1,
 // add other rows to the grid.
 if (spec.rowspan > 1) {
-rowspans.add(child, new RowSpan(child, column, row));
+rowspans.put(child, new RowSpan(child, column, row));
 }
 for (int j = 2; j <= spec.rowspan; j++) {
 if (row + j > grid.size()) {
-grid.append(new ArrayWrapperT!(TableWrapData)(createEmptyRow()));
+grid.addElement(new ArrayWrapperObject(createEmptyRow()));
 }
 }
 // Store the layout spec. Also cache the childIndex. NOTE: That we
 // assume the children of a
 // composite are maintained in the order in which they are created
 // and added to the composite.
-(cast(ArrayWrapperT!(TableWrapData)) grid.get(row)).array[column] = spec;
+arrayFromObject!(TableWrapData)( grid.elementAt(row))[column] = spec;
 spec.childIndex = i;
 if (spec.grabHorizontal) {
 updateGrowingColumns(growingCols, spec, column);
 }
 if (spec.grabVertical) {
 columnFill = spec.colspan - 1;
 for (int r = 1; r <= rowFill; r++) {
 for (int c = 0; c < spec.colspan; c++) {
 spacerSpec = new TableWrapData();
 spacerSpec.isItemData = false;
-(cast(ArrayWrapperT!(TableWrapData)) grid.get(row + r)).array[column + c] = spacerSpec;
+arrayFromObject!(TableWrapData)( grid.elementAt(row + r))[column + c] = spacerSpec;
 }
 }
 for (int c = 1; c <= columnFill; c++) {
 for (int r = 0; r < spec.rowspan; r++) {
 spacerSpec = new TableWrapData();
 spacerSpec.isItemData = false;
-(cast(ArrayWrapperT!(TableWrapData)) grid.get(row + r)).array[column + c] = spacerSpec;
+arrayFromObject!(TableWrapData)( grid.elementAt(row + r))[column + c] = spacerSpec;
 }
 }
 column = column + spec.colspan - 1;
 }
 // Fill out empty grid cells with spacers.
 for (int k = column + 1; k < numColumns; k++) {
 spacerSpec = new TableWrapData();
 spacerSpec.isItemData = false;
-(cast(ArrayWrapperT!(TableWrapData)) grid.get(row)).array[k] = spacerSpec;
+arrayFromObject!(TableWrapData)( grid.elementAt(row))[k] = spacerSpec;
 }
 for (int k = row + 1; k < grid.size(); k++) {
 spacerSpec = new TableWrapData();
 spacerSpec.isItemData = false;
-(cast(ArrayWrapperT!(TableWrapData)) grid.get(k)).array[column] = spacerSpec;
+arrayFromObject!(TableWrapData)( grid.elementAt(k))[column] = spacerSpec;
 }
 growingColumns = new int[growingCols.size()];
 for (int i = 0; i < growingCols.size(); i++) {
 growingColumns[i] = (cast(Integer) growingCols.get(i)).intValue();
 }
 for (int i = 0; i < growingRows.size(); i++) {
 this.growingRows[i] = (cast(Integer) growingRows.get(i)).intValue();
 }
 }
-private void updateGrowingColumns(ArraySeq!(Object) growingColumns,
+private void updateGrowingColumns(Vector growingColumns,
 TableWrapData spec, int column) {
 int affectedColumn = column + spec.colspan - 1;
 for (int i = 0; i < growingColumns.size(); i++) {
 Integer col = cast(Integer) growingColumns.get(i);
 if (col.intValue() is affectedColumn)
 return;
 }
-growingColumns.append(new Integer(affectedColumn));
+growingColumns.add(new Integer(affectedColumn));
 }
-private void updateGrowingRows(ArraySeq!(Object) growingRows, TableWrapData spec,
+private void updateGrowingRows(Vector growingRows, TableWrapData spec,
 int row) {
 int affectedRow = row + spec.rowspan - 1;
 for (int i = 0; i < growingRows.size(); i++) {
 Integer irow = cast(Integer) growingRows.get(i);
 if (irow.intValue() is affectedRow)
 return;
 }
-growingRows.append(new Integer(affectedRow));
+growingRows.add(new Integer(affectedRow));
 }
 private TableWrapData[] createEmptyRow() {
 TableWrapData[] row = new TableWrapData[numColumns];
 for (int i = 0; i < numColumns; i++)
 changed = true;
 initialLayout = false;
 }
 if (grid is null || changed) {
 changed = true;
-grid = new ArraySeq!(Object);
+grid = new Vector();
 createGrid(parent);
 }
 resetColumnWidths();
 int minWidth = internalGetMinimumWidth(parent, changed);
 int maxWidth = internalGetMaximumWidth(parent, changed);
 }
 int totalHeight = 0;
 int innerHeight = 0;
 // compute widths
 for (int i = 0; i < grid.size(); i++) {
-TableWrapData[] row = (cast(ArrayWrapperT!(TableWrapData)) grid.get(i)).array;
+TableWrapData[] row = arrayFromObject!(TableWrapData)( grid.elementAt(i));
 // assign widths, calculate heights
 int rowHeight = 0;
 for (int j = 0; j < numColumns; j++) {
 TableWrapData td = row[j];
 if (td.isItemData is false) {
 int cy = td.heightHint;
 if (cy is DWT.DEFAULT) {
 Point size = computeSize(td.childIndex, cwidth, td.indent, td.maxWidth, td.maxHeight);
 cy = size.y;
 }
-RowSpan rowspan = rowspans.containsKey(child) ? cast(RowSpan) rowspans.get(child) : null;
+RowSpan rowspan = cast(RowSpan) rowspans.get(child);
 if (rowspan !is null) {
 // don't take the height of this child into acount
 // because it spans multiple rows
 rowspan.height = cy;
 } else {
 updateRowSpans(i, rowHeight);
 if (i > 0)
 innerHeight += verticalSpacing;
 innerHeight += rowHeight;
 }
-if (!rowspans.drained())
+if (!rowspans.isEmpty())
 innerHeight = compensateForRowSpans(innerHeight);
 totalHeight = topMargin + innerHeight + bottomMargin;
 return new Point(tableWidth, totalHeight);
 }
 private void updateRowSpans(int row, int rowHeight) {
 if (rowspans is null || rowspans.size() is 0)
 return;
-foreach( k, v; rowspans ){
+for (Enumeration enm = rowspans.elements(); enm.hasMoreElements();) {
-RowSpan rowspan = cast(RowSpan) v;
+RowSpan rowspan = cast(RowSpan) enm.nextElement();
 rowspan.update(row, rowHeight);
 }
 }
 private int compensateForRowSpans(int totalHeight) {
-foreach( k, v; rowspans ){
+for (Enumeration enm = rowspans.elements(); enm.hasMoreElements();) {
-RowSpan rowspan = cast(RowSpan) v;
+RowSpan rowspan = cast(RowSpan) enm.nextElement();
 totalHeight += rowspan.getRequiredHeightIncrease();
 }
 return totalHeight;
 }
 }
 void calculateColumnWidths(Composite parent, int [] columnWidths, bool max, bool changed) {
 bool secondPassNeeded=false;
 for (int i = 0; i < grid.size(); i++) {
-TableWrapData[] row = (cast(ArrayWrapperT!(TableWrapData)) grid.get(i)).array;
+TableWrapData[] row = arrayFromObject!(TableWrapData)( grid.elementAt(i));
 for (int j = 0; j < numColumns; j++) {
 TableWrapData td = row[j];
 if (td.isItemData is false)
 continue;
 }
 if (!secondPassNeeded) return;
 // Second pass for controls with multi-column horizontal span
 for (int i = 0; i < grid.size(); i++) {
-TableWrapData[] row = (cast(ArrayWrapperT!(TableWrapData)) grid.get(i)).array;
+TableWrapData[] row = arrayFromObject!(TableWrapData)( grid.elementAt(i));
 for (int j = 0; j < numColumns; j++) {
 TableWrapData td = row[j];
 if (td.isItemData is false || td.colspan is 1)
 continue;

Mercurial > projects > dwt-addons

comparison dwtx/ui/forms/widgets/TableWrapLayout.d @ 104:04b47443bb01