projects/dwt-mac: dwt/widgets/TableItem.d comparison

comparison dwt/widgets/TableItem.d @ 45:d8635bb48c7c

Merge with SWT 3.5

author	Jacob Carlborg <doob@me.com>
date	Mon, 01 Dec 2008 17:07:00 +0100
parents	e831403a80a9
children	2d895a357833

comparison

equal deleted inserted replaced

-:ca5e494f2bbf
+:d8635bb48c7c
 /*******************************************************************************
-* Copyright (c) 2000, 2007 IBM Corporation and others.
+* Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 import dwt.graphics.Font;
 import dwt.graphics.GC;
 import dwt.graphics.Image;
 import dwt.graphics.Rectangle;
 import dwt.internal.cocoa.NSAttributedString;
+import dwt.internal.cocoa.NSBrowserCell;
 import dwt.internal.cocoa.NSColor;
 import dwt.internal.cocoa.NSMutableDictionary;
+import dwt.internal.cocoa.NSMutableParagraphStyle;
 import dwt.internal.cocoa.NSRect;
+import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSTableView;
 import dwt.internal.cocoa.OS;
 /**
 * <dd>(none)</dd>
 * </dl>
 * <p>
 * IMPORTANT: This class is <em>not</em> intended to be subclassed.
 * </p>
+*
+* @see <a href="http://www.eclipse.org/swt/snippets/#table">Table, TableItem, TableColumn snippets</a>
+* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public class TableItem : Item {
 Table parent;
 String [] strings;
 Image [] images;
 bool checked, grayed, cached;
 Color foreground, background;
 Color[] cellForeground, cellBackground;
 Font font;
 Font[] cellFont;
-int width = -1;
+int customWidth = -1;
 /**
 * Constructs a new instance of this class given its parent
 * (which must be a <code>Table</code>) and a style value
 * describing its behavior and appearance. The item is added
 static Table checkNull (Table control) {
 if (control is null) DWT.error (DWT.ERROR_NULL_ARGUMENT);
 return control;
 }
-int calculateWidth (int index, GC gc) {
+int calculateWidth (int columnIndex, GC gc, bool callMeasureItem) {
-if (index is 0 && width !is -1) return width;
+if (!callMeasureItem && customWidth !is -1) return customWidth;
-int width = 0;
-Image image = getImage (index);
+NSBrowserCell cell = parent.dataCell;
-String text = getText (index);
+cell.setFont (getFont (columnIndex).handle);
-gc.setFont (getFont (index));
+cell.setTitle (NSString.stringWith (getText (columnIndex)));
-//  if (image !is null) width += image.getBounds ().width + parent.getGap ();
+Image image = getImage (columnIndex);
-if (text !is null && text.length () > 0) width += gc.stringExtent (text).x;
+cell.setImage (image !is null ? image.handle : null);
-//  if (parent.hooks (DWT.MeasureItem)) {
+NSRect rect = new NSRect ();
-//      Event event = new Event ();
+rect.width = rect.height = Float.MAX_VALUE;
-//      event.item = this;
+NSSize size = cell.cellSizeForBounds (rect);
-//      event.index = index;
+int width = (int)Math.ceil (size.width);
-//      event.gc = gc;
-//      short [] height = new short [1];
+if (callMeasureItem && parent.hooks (DWT.MeasureItem)) {
-//      OS.GetDataBrowserTableViewRowHeight (parent.handle, height);
+NSTableView tableView = (NSTableView)parent.view;
-//      event.width = width;
+int nsColumnIndex = 0;
-//      event.height = height[0];
+if (parent.columnCount > 0) {
-//      parent.sendEvent (DWT.MeasureItem, event);
+nsColumnIndex = tableView.columnWithIdentifier (parent.columns[columnIndex].nsColumn);
-//      if (parent.itemHeight < event.height) {
+}
-//          parent.itemHeight = event.height;
+int rowIndex = parent.indexOf (this);
-//          OS.SetDataBrowserTableViewRowHeight (parent.handle, cast(short) event.height);
+rect = tableView.frameOfCellAtColumn (nsColumnIndex, rowIndex);
-//      }
+NSRect contentRect = cell.titleRectForBounds (rect);
-//      width = event.width;
+int rowHeight = (int)tableView.rowHeight ();
-//  }
+Event event = new Event ();
-if (index is 0) this.width = width;
+event.item = this;
+event.index = columnIndex;
+event.gc = gc;
+event.x = (int)contentRect.x;
+event.y = (int)contentRect.y;
+event.width = width;
+event.height = rowHeight;
+parent.sendEvent (DWT.MeasureItem, event);
+if (rowHeight < event.height) {
+tableView.setRowHeight (event.height);
+}
+if (parent.columnCount is 0) {
+int change = event.width - (customWidth !is -1 ? customWidth : width);
+if (customWidth !is -1 || event.width !is width) {
+customWidth = event.width;
+}
+if (change !is 0) parent.setScrollWidth (this, false);
+}
+width = event.width;
+}
 return width;
 }
 protected void checkSubclass () {
 if (!isValidSubclass ()) error (DWT.ERROR_INVALID_SUBCLASS);
 checked = grayed = cached = false;
 foreground = background = null;
 cellForeground = cellBackground = null;
 font = null;
 cellFont = null;
-width = -1;
+customWidth = -1;
 }
-NSAttributedString createString(int index) {
+NSAttributedString createString (int index) {
-NSMutableDictionary dict = NSMutableDictionary.dictionaryWithCapacity(4);
+NSMutableDictionary dict = NSMutableDictionary.dictionaryWithCapacity (4);
 Color foreground = cellForeground !is null ? cellForeground [index] : null;
 if (foreground is null) foreground = this.foreground;
 if (foreground is null) foreground = parent.foreground;
 if (foreground !is null) {
-NSColor color = NSColor.colorWithDeviceRed(foreground.handle[0], foreground.handle[1], foreground.handle[2], 1);
+NSColor color = NSColor.colorWithDeviceRed (foreground.handle [0], foreground.handle [1], foreground.handle [2], 1);
-dict.setObject(color, OS.NSForegroundColorAttributeName());
+dict.setObject(color, OS.NSForegroundColorAttributeName);
 }
 Font font = cellFont !is null ? cellFont [index] : null;
 if (font is null) font = this.font;
-//  if (font is null) font = parent.font;
+if (font is null) font = parent.font;
 if (font !is null) {
-dict.setObject(font.handle, OS.NSFontAttributeName());
+dict.setObject (font.handle, OS.NSFontAttributeName);
 }
-Color background = cellBackground !is null ? cellBackground [index] : null;
+NSMutableParagraphStyle paragraphStyle = (NSMutableParagraphStyle)new NSMutableParagraphStyle ().alloc ().init ();
-if (background is null) background = this.background;
+paragraphStyle.autorelease ();
-if (background !is null) {
+paragraphStyle.setLineBreakMode (OS.NSLineBreakByClipping);
-NSColor color = NSColor.colorWithDeviceRed(background.handle[0], background.handle[1], background.handle[2], 1);
+dict.setObject (paragraphStyle, OS.NSParagraphStyleAttributeName);
-dict.setObject(color, OS.NSBackgroundColorAttributeName());
+if (parent.columnCount > 0) {
-}
+TableColumn column = parent.getColumn (index);
+int style = column.getStyle ();
+if ((style & DWT.CENTER) !is 0) {
+paragraphStyle.setAlignment (OS.NSCenterTextAlignment);
+} else if ((style & DWT.RIGHT) !is 0) {
+paragraphStyle.setAlignment (OS.NSRightTextAlignment);
+}
+}
 String text = getText (index);
-int length = text.length();
+int length = text.length ();
-char[] chars = new char[length];
+char[] chars = new char [length];
 text.getChars(0, length, chars, 0);
-NSString str = NSString.stringWithCharacters(chars, length);
+NSString str = NSString.stringWithCharacters (chars, length);
-NSAttributedString attribStr = (cast(NSAttributedString)new NSAttributedString().alloc()).initWithString_attributes_(str, dict);
+NSAttributedString attribStr = (cast(NSAttributedString) (new NSAttributedString ()).alloc ()).initWithString (str, dict);
-attribStr.autorelease();
+attribStr.autorelease ();
 return attribStr;
 }
 void destroyWidget () {
 parent.destroyItem (this);
 public Rectangle getBounds () {
 checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
 NSTableView tableView = cast(NSTableView) parent.view;
 NSRect rect = tableView.rectOfRow (parent.indexOf (this));
-rect = tableView.convertRect_toView_ (rect, parent.scrollView);
+return new Rectangle((int) rect.x, (int) rect.y, (int) rect.width, (int) rect.height);
-Rectangle result = new Rectangle(cast(int) rect.x, cast(int) rect.y, cast(int) rect.width, cast(int) rect.height);
-return result;
 }
 /**
 * Returns a rectangle describing the receiver's size and location
 * relative to its parent at a column in the table.
 * </ul>
 */
 public Rectangle getBounds (int index) {
 checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-NSTableView tableView = cast(NSTableView) parent.view;
+if (!(0 <= index && index < Math.max (1, parent.columnCount))) return new Rectangle (0, 0, 0, 0);
-if ((parent.style & DWT.CHECK) !is 0) index ++;
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
 NSRect rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
-rect = tableView.convertRect_toView_ (rect, parent.scrollView);
+return new Rectangle ((int) rect.x, (int) rect.y, (int) rect.width, (int) rect.height);
-Rectangle result = new Rectangle(cast(int) rect.x, cast(int) rect.y, cast(int) rect.width, cast(int) rect.height);
-return result;
 }
 /**
 * Returns <code>true</code> if the receiver is checked,
 * and false otherwise.  When the parent does not have
 if ((parent.style & DWT.CHECK) is 0) return false;
 return grayed;
 }
 public Image getImage () {
-checkWidget();
+checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
 return super.getImage ();
 }
 /**
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public Image getImage (int index) {
-checkWidget();
+checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
 if (index is 0) return getImage ();
 if (images !is null) {
 if (0 <= index && index < images.length) return images [index];
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public Rectangle getImageBounds (int index) {
-checkWidget();
+checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-//  parent.checkItems (true);
+if (!(0 <= index && index < Math.max (1, parent.columnCount))) return new Rectangle (0, 0, 0, 0);
-//  if (index !is 0 && !(0 <= index && index < parent.columnCount)) return new Rectangle (0, 0, 0, 0);
-//  Rect rect = new Rect();
+NSTableView tableView = (NSTableView) parent.view;
-//  int itemIndex = parent.indexOf (this);
+Image image = index is 0 ? this.image : (images !is null) ? images [index] : null;
-//  int id = itemIndex + 1;
+if (parent.columnCount is 0) {
-//  int columnId = parent.columnCount is 0 ? parent.column_id : parent.columns [index].id;
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
-//  if (OS.GetDataBrowserItemPartBounds (parent.handle, id, columnId, OS.kDataBrowserPropertyContentPart, rect) !is OS.noErr) {
+} else {
-//      return new Rectangle (0, 0, 0, 0);
+TableColumn column = parent.getColumn (index);
-//  }
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
-//  int x = rect.left, y = rect.top;
+}
-//  int width = 0;
+NSRect rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
-//  if (index is 0 && image !is null) {
+//TODO is this right?
-//      Rectangle bounds = image.getBounds ();
+rect.width = image !is null ? image.getBounds().width : 0;
-//      width += bounds.width;
+return new Rectangle((int) rect.x, (int) rect.y, (int) rect.width, (int) rect.height);
-//  }
-//  if (index !is 0 && images !is null && images[index] !is null) {
-//      Rectangle bounds = images [index].getBounds ();
-//      width += bounds.width;
-//  }
-//  int height = rect.bottom - rect.top + 1;
-//  return new Rectangle (x, y, width, height);
-return null;
 }
 /**
 * Gets the image indent.
 *
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getImageIndent () {
-checkWidget();
+checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
 return 0;
 }
 String getNameText () {
 * @since 3.3
 */
 public Rectangle getTextBounds (int index) {
 checkWidget ();
 if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-//  parent.checkItems (true);
+if (!(0 <= index && index < Math.max (1, parent.columnCount))) return new Rectangle (0, 0, 0, 0);
-//  if (index !is 0 && !(0 <= index && index < parent.columnCount)) return new Rectangle (0, 0, 0, 0);
-//  Rect rect = new Rect();
+NSTableView tableView = (NSTableView) parent.view;
-//  int itemIndex = parent.indexOf (this);
+Image image = index is 0 ? this.image : (images !is null) ? images [index] : null;
-//  int id = itemIndex + 1;
+if (parent.columnCount is 0) {
-//  int columnId = parent.columnCount is 0 ? parent.column_id : parent.columns [index].id;
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
-//  if (OS.GetDataBrowserItemPartBounds (parent.handle, id, columnId, OS.kDataBrowserPropertyEnclosingPart, rect) !is OS.noErr) {
+} else {
-//      return new Rectangle (0, 0, 0, 0);
+TableColumn column = parent.getColumn (index);
-//  }
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
-//  int imageWidth = 0;
+}
-//  int margin = parent.getInsetWidth () / 2;
+NSRect rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
-//  Image image = getImage (index);
+//TODO is this right?
-//  if (image !is null) {
+if (image !is null) {
-//      Rectangle bounds = image.getBounds ();
+int imageWidth = image.getBounds().width;
-//      imageWidth = bounds.width + parent.getGap ();
+rect.x += imageWidth;
-//  }
+rect.width -= imageWidth;
-//  int x, y, width, height;
+}
-//  if (OS.VERSION >= 0x1040) {
+return new Rectangle((int) rect.x, (int) rect.y, (int) rect.width, (int) rect.height);
-//      if (parent.getLinesVisible ()) {
-//          rect.left += Table.GRID_WIDTH;
-//          rect.top += Table.GRID_WIDTH;
-//      }
-//      x = rect.left + imageWidth + margin;
-//      y = rect.top;
-//      width = Math.max (0, rect.right - rect.left - imageWidth - margin * 2);
-//      height = rect.bottom - rect.top;
-//  } else {
-//      Rect rect2 = new Rect();
-//      if (OS.GetDataBrowserItemPartBounds (parent.handle, id, columnId, OS.kDataBrowserPropertyContentPart, rect2) !is OS.noErr) {
-//          return new Rectangle (0, 0, 0, 0);
-//      }
-//      x = rect2.left + imageWidth + margin;
-//      y = rect2.top;
-//      width = Math.max (0, rect.right - rect2.left + 1 - imageWidth - margin * 2);
-//      height = rect2.bottom - rect2.top + 1;
-//  }
-//  return new Rectangle (x, y, width, height);
-return null;
 }
 void redraw () {
 //  0[aTableView setNeedsDisplayInRect:[aTableView rectOfRow:row]];
-(cast(NSTableView)parent.view).reloadData();
+(cast(NSTableView) parent.view).reloadData ();
-(cast(NSTableView)parent.view).tile();
+(cast(NSTableView) parent.view).tile ();
 }
 void releaseHandle () {
 super.releaseHandle ();
 parent = null;
 Color oldColor = background;
 if (oldColor is color) return;
 background = color;
 if (oldColor !is null && oldColor.equals (color)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
+NSTableView view = cast(NSTableView) parent.view;
-NSRect rect = view.rectOfRow(parent.indexOf(this));
+NSRect rect = view.rectOfRow (parent.indexOf (this));
-view.setNeedsDisplayInRect(rect);
+view.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the background color at the given column index in the receiver
 * to the color specified by the argument, or to the default system color for the item
 Color oldColor = cellBackground [index];
 if (oldColor is color) return;
 cellBackground [index] = color;
 if (oldColor !is null && oldColor.equals (color)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
-NSRect rect = view.frameOfCellAtColumn(index + ((parent.style & DWT.CHECK) !is 0 ? 1 : 0), parent.indexOf(this));
+NSTableView tableView = (NSTableView) parent.view;
-view.setNeedsDisplayInRect(rect);
+NSRect rect = null;
+if (parent.hooks (DWT.MeasureItem) || parent.hooks (DWT.EraseItem) || parent.hooks (DWT.PaintItem)) {
+rect = tableView.rectOfRow (parent.indexOf (this));
+} else {
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
+rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
+}
+tableView.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the checked state of the checkbox for this item.  This state change
 * only applies if the Table was created with the DWT.CHECK style.
 checkWidget ();
 if ((parent.style & DWT.CHECK) is 0) return;
 if (this.checked is checked) return;
 this.checked = checked;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
+NSTableView view = cast(NSTableView) parent.view;
-NSRect rect = view.rectOfRow(parent.indexOf(this));
+NSRect rect = view.rectOfRow (parent.indexOf (this));
-view.setNeedsDisplayInRect(rect);
+view.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the font that the receiver will use to paint textual information
 * for this item to the font specified by the argument, or to the default font
 Font oldFont = this.font;
 if (oldFont is font) return;
 this.font = font;
 if (oldFont !is null && oldFont.equals (font)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
+NSTableView view = cast(NSTableView) parent.view;
-NSRect rect = view.rectOfRow(parent.indexOf(this));
+NSRect rect = view.rectOfRow (parent.indexOf (this));
-view.setNeedsDisplayInRect(rect);
+view.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the font that the receiver will use to paint textual information
 * for the specified cell in this item to the font specified by the
 Font oldFont = cellFont [index];
 if (oldFont is font) return;
 cellFont [index] = font;
 if (oldFont !is null && oldFont.equals (font)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
-NSRect rect = view.frameOfCellAtColumn(index + ((parent.style & DWT.CHECK) !is 0 ? 1 : 0), parent.indexOf(this));
+NSTableView tableView = (NSTableView) parent.view;
-view.setNeedsDisplayInRect(rect);
+NSRect rect = null;
+if (parent.hooks (DWT.MeasureItem) || parent.hooks (DWT.EraseItem) || parent.hooks (DWT.PaintItem)) {
+rect = tableView.rectOfRow (parent.indexOf (this));
+} else {
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
+rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
+}
+tableView.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the receiver's foreground color to the color specified
 * by the argument, or to the default system color for the item
 Color oldColor = foreground;
 if (oldColor is color) return;
 foreground = color;
 if (oldColor !is null && oldColor.equals (color)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
+NSTableView view = cast(NSTableView) parent.view;
-NSRect rect = view.rectOfRow(parent.indexOf(this));
+NSRect rect = view.rectOfRow (parent.indexOf (this));
-view.setNeedsDisplayInRect(rect);
+view.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the foreground color at the given column index in the receiver
 * to the color specified by the argument, or to the default system color for the item
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 *
 * @since 3.0
 */
-public void setForeground (int index, Color color){
+public void setForeground (int index, Color color) {
 checkWidget ();
 if (color !is null && color.isDisposed ()) {
 DWT.error (DWT.ERROR_INVALID_ARGUMENT);
 }
 int count = Math.max (1, parent.columnCount);
 Color oldColor = cellForeground [index];
 if (oldColor is color) return;
 cellForeground [index] = color;
 if (oldColor !is null && oldColor.equals (color)) return;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
-NSRect rect = view.frameOfCellAtColumn(index + ((parent.style & DWT.CHECK) !is 0 ? 1 : 0), parent.indexOf(this));
+NSTableView tableView = (NSTableView) parent.view;
-view.setNeedsDisplayInRect(rect);
+NSRect rect = null;
+if (parent.hooks (DWT.MeasureItem) || parent.hooks (DWT.EraseItem) || parent.hooks (DWT.PaintItem)) {
+rect = tableView.rectOfRow (parent.indexOf (this));
+} else {
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
+rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
+}
+tableView.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the grayed state of the checkbox for this item.  This state change
 * only applies if the Table was created with the DWT.CHECK style.
 checkWidget ();
 if ((parent.style & DWT.CHECK) is 0) return;
 if (this.grayed is grayed) return;
 this.grayed = grayed;
 cached = true;
-NSTableView view = cast(NSTableView)parent.view;
+NSTableView view = cast(NSTableView) parent.view;
-NSRect rect = view.rectOfRow(parent.indexOf(this));
+NSRect rect = view.rectOfRow (parent.indexOf (this));
-view.setNeedsDisplayInRect(rect);
+view.setNeedsDisplayInRect (rect);
 }
 /**
 * Sets the image for multiple columns in the table.
 *
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setImage (Image [] images) {
-checkWidget();
+checkWidget ();
 if (images is null) error (DWT.ERROR_NULL_ARGUMENT);
 for (int i=0; i<images.length; i++) {
 setImage (i, images [i]);
 }
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setImage (int index, Image image) {
-checkWidget();
+checkWidget ();
 if (image !is null && image.isDisposed ()) {
 error(DWT.ERROR_INVALID_ARGUMENT);
 }
 int itemIndex = parent.indexOf (this);
 if (itemIndex is -1) return;
 //  }
 if (index is 0)  {
 if (image !is null && image.type is DWT.ICON) {
 if (image.equals (this.image)) return;
 }
-width = -1;
+customWidth = -1;
 super.setImage (image);
 }
 int count = Math.max (1, parent.columnCount);
 if (0 <= index && index < count) {
 if (images is null) images = new Image [count];
 }
 images [index] = image;
 }
 //  cached = true;
 //  if (index is 0) parent.setScrollWidth (this);
-NSTableView view = cast(NSTableView)parent.view;
-NSRect rect = view.frameOfCellAtColumn(index + ((parent.style & DWT.CHECK) !is 0 ? 1 : 0), parent.indexOf(this));
+NSTableView tableView = (NSTableView) parent.view;
-view.setNeedsDisplayInRect(rect);
+NSRect rect = null;
+if (parent.hooks (DWT.MeasureItem) || parent.hooks (DWT.EraseItem) || parent.hooks (DWT.PaintItem)) {
+rect = tableView.rectOfRow (parent.indexOf (this));
+} else {
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
+rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
+}
+tableView.setNeedsDisplayInRect (rect);
 }
 public void setImage (Image image) {
 checkWidget ();
 setImage (0, image);
 * </ul>
 *
 * @deprecated this functionality is not supported on most platforms
 */
 public void setImageIndent (int indent) {
-checkWidget();
+checkWidget ();
 if (indent < 0) return;
 cached = true;
 /* Image indent is not supported on the Macintosh */
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setText (String [] strings) {
-checkWidget();
+checkWidget ();
 if (strings is null) error (DWT.ERROR_NULL_ARGUMENT);
 for (int i=0; i<strings.length; i++) {
 String string = strings [i];
 if (string !is null) setText (i, string);
 }
 *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public void setText (int index, String string) {
-checkWidget();
+checkWidget ();
 if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
 if (index is 0) {
 if (string.equals (text)) return;
-width = -1;
+customWidth = -1;
 super.setText (string);
 }
 int count = Math.max (1, parent.columnCount);
 if (0 <= index && index < count) {
 if (strings is null) strings = new String [count];
 if (string.equals (strings [index])) return;
 strings [index] = string;
 }
 cached = true;
-if (index is 0) parent.setScrollWidth (this);
+if (index is 0) parent.setScrollWidth (this, true);
-NSTableView view = cast(NSTableView)parent.view;
-NSRect rect = view.frameOfCellAtColumn(index + ((parent.style & DWT.CHECK) !is 0 ? 1 : 0), parent.indexOf(this));
+NSTableView tableView = (NSTableView) parent.view;
-view.setNeedsDisplayInRect(rect);
+NSRect rect = null;
+if (parent.hooks (DWT.MeasureItem) || parent.hooks (DWT.EraseItem) || parent.hooks (DWT.PaintItem)) {
+rect = tableView.rectOfRow (parent.indexOf (this));
+} else {
+if (parent.columnCount is 0) {
+index = (parent.style & DWT.CHECK) !is 0 ? 1 : 0;
+} else {
+TableColumn column = parent.getColumn (index);
+index = (int)/*64*/tableView.columnWithIdentifier (column.nsColumn);
+}
+rect = tableView.frameOfCellAtColumn (index, parent.indexOf (this));
+}
+tableView.setNeedsDisplayInRect (rect);
 }
 public void setText (String string) {
-checkWidget();
+checkWidget ();
 setText (0, string);
 }
 }

Mercurial > projects > dwt-mac

comparison dwt/widgets/TableItem.d @ 45:d8635bb48c7c