Attachment #149735 for bug #287056

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 287056
Collapse All | Expand All

Lines 1219-1224 Link Here

(-)js/org/eclipse/swt/widgets/Table.js (-7 / +7 lines)
1219	// Append rows if rowCount was increased	1219	// Append rows if rowCount was increased
1220	if( this._rows.length < newRowCount ) {	1220	if( this._rows.length < newRowCount ) {
1221	while( this._rows.length < newRowCount ) {	1221	while( this._rows.length < newRowCount ) {
		1222	var newRow = new org.eclipse.swt.widgets.TableRow();
		1223	this._hookRowEventListener( newRow );
		1224	newRow.setLinesVisible( this._linesVisible );
		1225	this._clientArea.add( newRow );
		1226	this._rows.push( newRow );
1222	if( this._checkBoxes != null ) {	1227	if( this._checkBoxes != null ) {
1223	var checkBox = new qx.ui.basic.Image();	1228	var checkBox = new qx.ui.basic.Image();
1224	checkBox.addEventListener( "click", this._onCheckBoxClick, this );	1229	checkBox.addEventListener( "click", this._onCheckBoxClick, this );
Lines 1232-1242 Link Here
1232	this._clientArea.add( checkBox );	1237	this._clientArea.add( checkBox );
1233	this._checkBoxes.push( checkBox );	1238	this._checkBoxes.push( checkBox );
1234	}	1239	}
1235	var newRow = new org.eclipse.swt.widgets.TableRow();
1236	this._hookRowEventListener( newRow );
1237	newRow.setLinesVisible( this._linesVisible );
1238	this._clientArea.add( newRow );
1239	this._rows.push( newRow );
1240	}	1240	}
1241	}	1241	}
1242	// Re-calculate the position and size for each row	1242	// Re-calculate the position and size for each row
Lines 1299-1306 Link Here
1299	checkBox.setHeight( checkImageHeight );	1299	checkBox.setHeight( checkImageHeight );
1300	}	1300	}
1301	var row = this._rows[ i ];	1301	var row = this._rows[ i ];
1302	row.setLeft( left + checkBoxWidth );	1302	row.setLeft( left );
1303	row.setWidth( width );	1303	row.setWidth( width + checkBoxWidth );
1304	row.setHeight( this._itemHeight );	1304	row.setHeight( this._itemHeight );
1305	}	1305	}
1306	},	1306	},




        // If in column mode, cut image width if image exceeds right cell border
        int imageWidth = tableAdapter.getItemImageWidth( i );
        if( table.getColumnCount() > 0 ) {
          int maxImageWidth
            = bounds.width - ( ( imageBounds.x - checkWidth ) - bounds.x );
          if( imageWidth > maxImageWidth ) {
            imageWidth = maxImageWidth;
          }
        }
        result[ i ].left = bounds.x;
        result[ i ].width = bounds.width;
        result[ i ].imageLeft = imageBounds.x;
        result[ i ].imageWidth = imageWidth;
        result[ i ].textLeft = textBounds.x;
        result[ i ].textWidth = textBounds.width;
      }
    }

Return to bug 287056

Lines 139-154 Link Here

(-)src/org/eclipse/swt/internal/widgets/tablekit/TableLCAUtil.java (-4 / +5 lines)
139	// If in column mode, cut image width if image exceeds right cell border	139	// If in column mode, cut image width if image exceeds right cell border
140	int imageWidth = tableAdapter.getItemImageWidth( i );	140	int imageWidth = tableAdapter.getItemImageWidth( i );
141	if( table.getColumnCount() > 0 ) {	141	if( table.getColumnCount() > 0 ) {
142	int maxImageWidth = bounds.width - ( ( imageBounds.x - checkWidth ) - bounds.x );	142	int maxImageWidth
		143	= bounds.width - ( ( imageBounds.x - checkWidth ) - bounds.x );
143	if( imageWidth > maxImageWidth ) {	144	if( imageWidth > maxImageWidth ) {
144	imageWidth = maxImageWidth;	145	imageWidth = maxImageWidth;
145	}	146	}
146	}	147	}
147	result[ i ].left = bounds.x - checkWidth;	148	result[ i ].left = bounds.x;
148	result[ i ].width = bounds.width;	149	result[ i ].width = bounds.width;
149	result[ i ].imageLeft = imageBounds.x - checkWidth;	150	result[ i ].imageLeft = imageBounds.x;
150	result[ i ].imageWidth = imageWidth;	151	result[ i ].imageWidth = imageWidth;
151	result[ i ].textLeft = textBounds.x - checkWidth;	152	result[ i ].textLeft = textBounds.x;
152	result[ i ].textWidth = textBounds.width;	153	result[ i ].textWidth = textBounds.width;
153	}	154	}
154	}	155	}