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

comparison dwt/widgets/List.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	cfa563df4fdd

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.dwthelper.utils;
 import dwt.DWT;
 import dwt.DWTException;
+import dwt.accessibility.ACC;
 import dwt.events.SelectionEvent;
 import dwt.events.SelectionListener;
 import dwt.graphics.Color;
 import dwt.graphics.GC;
 import dwt.graphics.Point;
 import dwt.graphics.Rectangle;
 import dwt.internal.cocoa.NSAttributedString;
 import dwt.internal.cocoa.NSColor;
+import dwt.internal.cocoa.NSEvent;
+import dwt.internal.cocoa.NSFont;
 import dwt.internal.cocoa.NSIndexSet;
 import dwt.internal.cocoa.NSMutableDictionary;
 import dwt.internal.cocoa.NSMutableIndexSet;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.NSRect;
+import dwt.internal.cocoa.NSScrollView;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSTableColumn;
 import dwt.internal.cocoa.NSTableView;
 import dwt.internal.cocoa.OS;
 import dwt.internal.cocoa.SWTScrollView;
 import dwt.internal.cocoa.SWTTableView;
+import dwt.internal.cocoa.id;
 /**
 * Instances of this class represent a selectable user interface
 * object that displays a list of strings and issues notification
 * when a string is selected.  A list may be single or multi select.
 * <p>
 * Note: Only one of SINGLE and MULTI may be specified.
 * </p><p>
 * IMPORTANT: This class is <em>not</em> intended to be subclassed.
 * </p>
+*
+* @see <a href="http://www.eclipse.org/swt/snippets/#list">List snippets</a>
+* @see <a href="http://www.eclipse.org/swt/examples.php">DWT Example: ControlExample</a>
+* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public class List : Scrollable {
 NSTableColumn column;
 String [] items;
 int itemCount;
 * @see Widget#checkSubclass
 * @see Widget#getStyle
 */
 public this (Composite parent, int style) {
 super (parent, checkStyle (style));
+}
+int accessibilityAttributeValue (int /*long*/ id, int /*long*/ sel, int /*long*/ arg0) {
+if (accessible !is null) {
+NSString attribute = new NSString(arg0);
+id returnValue = accessible.internal_accessibilityAttributeValue(attribute, ACC.CHILDID_SELF);
+if (returnValue !is null) return returnValue.id;
+}
+NSString attributeName = new NSString(arg0);
+// Accessibility Verifier queries for a title or description.  NSOutlineView doesn't
+// seem to return either, so we return a default description value here.
+if (attributeName.isEqualToString (OS.NSAccessibilityDescriptionAttribute)) {
+return NSString.stringWith("").id;
+}
+//  if (attributeName.isEqualToString(OS.NSAccessibilityHeaderAttribute)) {
+//      /*
+//      * Bug in the Macintosh.  Even when the header is not visible,
+//      * VoiceOver still reports each column header's role for every row.
+//      * This is confusing and overly verbose.  The fix is to return
+//      * "no header" when the screen reader asks for the header, by
+//      * returning noErr without setting the event parameter.
+//      */
+//      return 0;
+//  }
+return super.accessibilityAttributeValue(id, sel, arg0);
 }
 /**
 * Adds the argument to the end of the receiver's list.
 *
 Rectangle rect = computeTrim (0, 0, width, height);
 return new Point (rect.width, rect.height);
 }
 void createHandle () {
-SWTScrollView scrollWidget = cast(SWTScrollView)new SWTScrollView().alloc();
+NSScrollView scrollWidget = cast(NSScrollView)new SWTScrollView().alloc();
 scrollWidget.initWithFrame(new NSRect ());
 if ((style & DWT.H_SCROLL) !is 0) scrollWidget.setHasHorizontalScroller(true);
 if ((style & DWT.V_SCROLL) !is 0) scrollWidget.setHasVerticalScroller(true);
 scrollWidget.setAutohidesScrollers(true);
 scrollWidget.setBorderType((style & DWT.BORDER) !is 0 ? OS.NSBezelBorder : OS.NSNoBorder);
-scrollWidget.setTag(jniRef);
 NSTableView widget = cast(NSTableView)new SWTTableView().alloc();
 widget.initWithFrame(new NSRect());
 widget.setAllowsMultipleSelection((style & DWT.MULTI) !is 0);
 widget.setDataSource(widget);
 widget.setHeaderView(null);
 widget.setDelegate(widget);
 widget.setDoubleAction(OS.sel_sendDoubleSelection);
 if (!hasBorder()) widget.setFocusRingType(OS.NSFocusRingTypeNone);
-widget.setTag(jniRef);
 column = cast(NSTableColumn)new NSTableColumn().alloc();
 column.initWithIdentifier(NSString.stringWith(""));
 widget.addTableColumn (column);
 scrollView = scrollWidget;
 view = widget;
-scrollView.setDocumentView(widget);
-parent.contentView().addSubview_(scrollView);
 }
 void createWidget () {
 super.createWidget ();
 items = new String [4];
 checkWidget();
 if (start > end) return;
 if (end < 0 || start >= itemCount) return;
 start = Math.max (0, start);
 end = Math.min (itemCount - 1, end);
-int length = end - start + 1;
-if (length <= 0) return;
 if (start is 0 && end is itemCount - 1) {
 deselectAll ();
 } else {
 NSTableView widget = cast(NSTableView)view;
 ignoreSelect = true;
-for (int i=0; i<length; i++) {
+for (int i=start; i<=end; i++) {
 widget.deselectRow (i);
 }
 ignoreSelect = false;
 }
 }
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getFocusIndex () {
 checkWidget();
-//  int [] first = new int [1], last = new int [1];
+return (int)/*64*/((NSTableView)view).selectedRow();
-//  if (OS.GetDataBrowserSelectionAnchor (handle, first, last) !is OS.noErr) return -1;
-//    return first [0] - 1;
-return -1;
 }
 /**
 * Returns the item at the given, zero-relative index in the
 * receiver. Throws an exception if the index is out of range.
 NSTableView widget = cast(NSTableView)view;
 if (widget.numberOfSelectedRows() is 0) {
 return new String [0];
 }
 NSIndexSet selection = widget.selectedRowIndexes();
-int count = selection.count();
+int count = (int)/*64*/selection.count();
-int [] indexBuffer = new int [count];
+int /*long*/ [] indexBuffer = new int /*long*/ [count];
 selection.getIndexes(indexBuffer, count, 0);
 String [] result = new String  [count];
 for (int i=0; i<count; i++) {
-result [i] = items [indexBuffer [i]];
+result [i] = items [(int)/*64*/indexBuffer [i]];
 }
 return result;
 }
 /**
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getSelectionCount () {
 checkWidget ();
-return (cast(NSTableView)view).numberOfSelectedRows();
+return cast(int)/*64*/(cast(NSTableView)view).numberOfSelectedRows();
 }
 /**
 * Returns the zero-relative index of the item which is currently
 * selected in the receiver, or -1 if no item is selected.
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public int getSelectionIndex () {
 checkWidget();
-//TODO - check empty selection case
+NSTableView widget = (NSTableView)view;
-return (cast(NSTableView)view).selectedRow();
+if (widget.numberOfSelectedRows() is 0) {
+return -1;
+}
+NSIndexSet selection = widget.selectedRowIndexes();
+int count = (int)/*64*/selection.count();
+int /*long*/ [] result = new int /*long*/ [count];
+selection.getIndexes(result, count, 0);
+return (int)/*64*/result [0];
 }
 /**
 * Returns the zero-relative indices of the items which are currently
 * selected in the receiver.  The order of the indices is unspecified.
 NSTableView widget = cast(NSTableView)view;
 if (widget.numberOfSelectedRows() is 0) {
 return new int [0];
 }
 NSIndexSet selection = widget.selectedRowIndexes();
-int count = selection.count();
+int count = (int)/*64*/selection.count();
+int /*long*/ [] indices = new int /*long*/ [count];
+selection.getIndexes(indices, count, 0);
 int [] result = new int [count];
-selection.getIndexes(result, count, 0);
+for (int i = 0; i < result.length; i++) {
+result [i] = (int)/*64*/indices [i];
+}
 return result;
 }
 /**
 * Returns the zero-relative index of the item which is currently
 //TODO - partial item at the top
 NSRect rect = scrollView.documentVisibleRect();
 NSPoint point = new NSPoint();
 point.x = rect.x;
 point.y = rect.y;
-return (cast(NSTableView)view).rowAtPoint(point);
+int result = (int)/*64*/(cast(NSTableView)view).rowAtPoint(point);
+if (result is -1) result = 0;
+return result;
 }
 /**
 * Gets the index of an item.
 * <p>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
 * </ul>
 */
 public bool isSelected (int index) {
 checkWidget();
-//TODO - range check
+if (!(0 <= index && index < itemCount)) return false;
 return (cast(NSTableView)view).isRowSelected(index);
 }
-int numberOfRowsInTableView(int aTableView) {
+int /*long*/ numberOfRowsInTableView(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView) {
 return itemCount;
 }
 void releaseHandle () {
 super.releaseHandle ();
 if (0 <= index && index < itemCount) {
 NSIndexSet indexes = cast(NSIndexSet)new NSIndexSet().alloc();
 indexes.initWithIndex(index);
 NSTableView widget = cast(NSTableView)view;
 ignoreSelect = true;
-(cast(NSTableView)view).selectRowIndexes(indexes, true);
+widget.selectRowIndexes(indexes, (style & DWT.MULTI) !is 0);
 ignoreSelect = false;
 }
 }
 /**
 range.location = start;
 range.length = length;
 indexes.initWithIndexesInRange(range);
 NSTableView widget = cast(NSTableView)view;
 ignoreSelect = true;
-widget.selectRowIndexes(indexes, true);
+widget.selectRowIndexes(indexes, (style & DWT.MULTI) !is 0);
 ignoreSelect = false;
 }
 }
 /**
 int length = indices.length;
 if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
 int count = 0;
 NSMutableIndexSet indexes = cast(NSMutableIndexSet)new NSMutableIndexSet().alloc().init();
 for (int i=0; i<length; i++) {
-int index = indices [length - i - 1];
+int index = indices [i];
 if (index >= 0 && index < itemCount) {
 indexes.addIndex (indices [i]);
 count++;
 }
 }
 if (count > 0) {
 NSTableView widget = cast(NSTableView)view;
 ignoreSelect = true;
-widget.selectRowIndexes(indexes, true);
+widget.selectRowIndexes(indexes, (style & DWT.MULTI) !is 0);
 ignoreSelect = false;
 }
 }
 void select (int [] ids, int count, bool clear) {
 ignoreSelect = false;
 }
 void sendDoubleSelection() {
 postEvent (DWT.DefaultSelection);
+}
+bool sendKeyEvent (NSEvent nsEvent, int type) {
+bool result = super.sendKeyEvent (nsEvent, type);
+if (!result) return result;
+if (type !is DWT.KeyDown) return result;
+short keyCode = nsEvent.keyCode ();
+switch (keyCode) {
+case 76: /* KP Enter */
+case 36: { /* Return */
+postEvent (DWT.DefaultSelection);
+break;
+}
+}
+return result;
+}
+void setBackground (float [] color) {
+super.setBackground (color);
+NSColor nsColor;
+if (color is null) {
+nsColor = null;
+} else {
+nsColor = NSColor.colorWithDeviceRed (color [0], color [1], color [2], 1);
+}
+((NSTableView) view).setBackgroundColor (nsColor);
+}
+void setFont (NSFont font) {
+super.setFont (font);
+float ascent = font.ascender ();
+float descent = -font.descender () + font.leading ();
+((NSTableView)view).setRowHeight ((int)Math.ceil (ascent + descent) + 1);
 }
 /**
 * Sets the text of the item in the receiver's list at the given
 * zero-relative index to the string argument.
 checkWidget();
 int index = getSelectionIndex ();
 if (index >= 0) showIndex (index);
 }
-void tableViewSelectionDidChange (int aNotification) {
+void tableViewSelectionDidChange (int /*long*/ id, int /*long*/ sel, int /*long*/ aNotification) {
 if (ignoreSelect) return;
 postEvent (DWT.Selection);
 }
-bool tableView_shouldEditTableColumn_row(int aTableView, int aTableColumn, int rowIndex) {
+bool tableView_shouldEditTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
 return false;
 }
-int tableView_objectValueForTableColumn_row(int aTableView, int aTableColumn, int rowIndex) {
+int /*long*/ tableView_objectValueForTableColumn_row(int /*long*/ id, int /*long*/ sel, int /*long*/ aTableView, int /*long*/ aTableColumn, int /*long*/ rowIndex) {
 NSMutableDictionary dict = NSMutableDictionary.dictionaryWithCapacity(4);
 if (foreground !is null) {
 NSColor color = NSColor.colorWithDeviceRed(foreground.handle[0], foreground.handle[1], foreground.handle[2], 1);
-dict.setObject(color, OS.NSForegroundColorAttributeName());
+dict.setObject(color, OS.NSForegroundColorAttributeName);
 }
 if (font !is null) {
-dict.setObject(font.handle, OS.NSFontAttributeName());
+dict.setObject(font.handle, OS.NSFontAttributeName);
 }
-if (background !is null) {
+String text = items[(int)/*64*/rowIndex];
-NSColor color = NSColor.colorWithDeviceRed(background.handle[0], background.handle[1], background.handle[2], 1);
-dict.setObject(color, OS.NSBackgroundColorAttributeName());
-}
-String text = items[rowIndex];
 int length = text.length();
 char[] chars = new char[length];
 text.getChars(0, length, chars, 0);
 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();
 return attribStr.id;
 }
 }

Mercurial > projects > dwt-mac

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