dwindows: mac/dw.m comparison

comparison mac/dw.m @ 882:1e7b7f870d88

Experimental change to use a single column for holding the filename and icon on Mac. This improves the appearance of filesystem containers and the tree view with icons.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 07 Apr 2011 03:34:42 +0000
parents	7b2750744552
children	d94a4fa0359e

comparison

equal deleted inserted replaced

-:7b2750744552
+:1e7b7f870d88
 -(void)setScrollview:(id)input;
 -(void)addColumn:(NSTableColumn *)input andType:(int)type;
 -(NSTableColumn *)getColumn:(int)col;
 -(int)addRow:(NSArray *)input;
 -(int)addRows:(int)number;
+-(void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
 -(void)editCell:(id)input at:(int)row and:(int)col;
 -(void)removeRow:(int)row;
 -(void)setRow:(int)row title:(void *)input;
 -(void *)getRowTitle:(int)row;
 -(id)getRow:(int)row and:(int)col;
 [titles addPointer:NULL];
 }
 return (int)[titles count];
 }
 return 0;
+}
+-(void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
+{
+if([cell isMemberOfClass:[NSBrowserCell class]])
+{
+int index = (int)(row * [tvcols count]);
+NSBrowserCell *browsercell = [data objectAtIndex:index];
+NSImage *img = [browsercell image];
+[(NSBrowserCell*)cell setImage:img];
+}
 }
 -(void)editCell:(id)input at:(int)row and:(int)col
 {
 if(tvcols && input)
 {
 -(void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn
 {
 NSUInteger index = [tvcols indexOfObject:tableColumn];
-if(filesystem && index > 0)
-{
-index--;
-}
 /* Handler for column click class */
 _event_handler(self, (NSEvent *)index, 17);
 }
 -(void)selectionChanged:(id)sender
 {
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSOutlineViewDataSource,NSOutlineViewDelegate>
 #endif
 {
 void *userdata;
-NSTableColumn *imagecol;
+NSTableColumn *treecol;
-NSTableColumn *textcol;
 NSMutableArray *data;
 /* Each data item consists of a linked lists of tree item data.
 * NSImage *, NSString *, Item Data *, NSMutableArray * of Children
 */
 id scrollview;
 }
 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
 -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
+-(void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item;
 -(BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item;
 -(void)addTree:(NSPointerArray *)item and:(NSPointerArray *)parent;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)treeSelectionChanged:(id)sender;
 {
 self = [super init];
 if (self)
 {
-imagecol = [[NSTableColumn alloc] init];
+treecol = [[NSTableColumn alloc] init];
-NSImageCell *imagecell = [[[NSImageCell alloc] init] autorelease];
+NSBrowserCell *browsercell = [[[NSBrowserCell alloc] init] autorelease];
-[imagecol setDataCell:imagecell];
+[browsercell setLeaf:YES];
-[imagecol setResizingMask:NSTableColumnNoResizing];
+[treecol setDataCell:browsercell];
-[imagecol setWidth:20];
+[self addTableColumn:treecol];
-[self addTableColumn:imagecol];
+[self setOutlineTableColumn:treecol];
-textcol = [[NSTableColumn alloc] init];
-[textcol setEditable:NO];
-[self addTableColumn:textcol];
-[self setOutlineTableColumn:textcol];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeSelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:self];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeItemExpanded:) name:NSOutlineViewItemDidExpandNotification object:self];
 }
 return self;
 }
 if(item)
 {
 if([item isKindOfClass:[NSPointerArray class]])
 {
 NSPointerArray *this = (NSPointerArray *)item;
-if(tableColumn == imagecol)
-{
-return [this pointerAtIndex:0];
-}
 return [this pointerAtIndex:1];
 }
 else
 {
 return nil;
 }
 }
 return @"List Root";
+}
+-(void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
+{
+if([cell isMemberOfClass:[NSBrowserCell class]])
+{
+NSPointerArray *this = (NSPointerArray *)item;
+NSImage *img = [this pointerAtIndex:0];
+[(NSBrowserCell*)cell setImage:img];
+}
 }
 -(BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item { return NO; }
 -(void)addTree:(NSPointerArray *)item and:(NSPointerArray *)parent;
 {
 NSMutableArray *children = data;
 -(NSScrollView *)scrollview { return scrollview; }
 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
 -(void)deleteNode:(NSPointerArray *)item { _free_tree_recurse(data, item); }
 -(void)setForegroundColor:(NSColor *)input
 {
-NSTextFieldCell *cell = [textcol dataCell];
+NSTextFieldCell *cell = [treecol dataCell];
 fgcolor = input;
 [fgcolor retain];
 [cell setTextColor:fgcolor];
 }
 -(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
 -(void)dealloc
 {
 UserData *root = userdata;
 _remove_userdata(&root, NULL, TRUE);
 _free_tree_recurse(data, NULL);
-[imagecol release];
+[treecol release];
-[textcol release];
 [super dealloc];
 }
 @end
 /* Subclass for a Calendar type */
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [tree setAllowsMultipleSelection:NO];
 [tree setDataSource:tree];
+[tree setDelegate:tree];
 [scrollview setDocumentView:tree];
 [tree setHeaderView:nil];
 [tree setTag:cid];
 [scrollview release];
 DW_MUTEX_UNLOCK;
 [[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
 if(flags[z] & DW_CFA_BITMAPORICON)
 {
 NSImageCell *imagecell = [[NSImageCell alloc] init];
 [column setDataCell:imagecell];
-if(z == 0 && titles[z] && strcmp(titles[z], "Icon") == 0)
-{
-[column setResizingMask:NSTableColumnNoResizing];
-[column setWidth:20];
-}
 [imagecell release];
 }
-else if(flags[z] & DW_CFA_RIGHT)
+else if(flags[z] & DW_CFA_STRINGANDICON)
+{
+NSBrowserCell *browsercell = [[NSBrowserCell alloc] init];
+[browsercell setLeaf:YES];
+[column setDataCell:browsercell];
+[browsercell release];
+}
+/* Defaults to left justified so just handle right and center */
+if(flags[z] & DW_CFA_RIGHT)
 {
 [(NSCell *)[column dataCell] setAlignment:NSRightTextAlignment];
 [(NSCell *)[column headerCell] setAlignment:NSRightTextAlignment];
 }
 else if(flags[z] & DW_CFA_CENTER)
 *          titles: An array of strings with column text titles.
 *          count: The number of columns (this should match the arrays).
 */
 int API dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
 {
-char **newtitles = malloc(sizeof(char *) * (count + 2));
+char **newtitles = malloc(sizeof(char *) * (count + 1));
-unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 2));
+unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 1));
 DWContainer *cont = handle;
-newtitles[0] = "Icon";
+newtitles[0] = "Filename";
-newtitles[1] = "Filename";
+newflags[0] = DW_CFA_STRINGANDICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
-newflags[0] = DW_CFA_BITMAPORICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
-newflags[1] = DW_CFA_STRING | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
+memcpy(&newtitles[1], titles, sizeof(char *) * count);
+memcpy(&newflags[1], flags, sizeof(unsigned long) * count);
-memcpy(&newtitles[2], titles, sizeof(char *) * count);
-memcpy(&newflags[2], flags, sizeof(unsigned long) * count);
+dw_container_setup(handle, newflags, newtitles, count + 1, 0);
-dw_container_setup(handle, newflags, newtitles, count + 2, 0);
 [cont setFilesystem:YES];
 free(newtitles);
 free(newflags);
 return TRUE;
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
 {
-dw_container_change_item(handle, column+2, row, data);
+dw_container_change_item(handle, column+1, row, data);
 }
 /*
 * Changes an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
 {
-dw_container_change_item(handle, 0, row, &icon);
+dw_filesystem_set_file(handle, NULL, row, filename, icon);
-dw_container_change_item(handle, 1, row, &filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon)
 {
-dw_container_set_item(handle, pointer, 0, row, &icon);
+int _locked_by_me = FALSE;
-dw_container_set_item(handle, pointer, 1, row, &filename);
+DW_MUTEX_LOCK;
+DWContainer *cont = handle;
+NSBrowserCell *browsercell;
+int lastadd = 0;
+/* If pointer is NULL we are getting a change request instead of set */
+if(pointer)
+{
+lastadd = [cont lastAddPoint];
+}
+browsercell = [[NSBrowserCell alloc] init];
+[browsercell setLeaf:YES];
+[browsercell setImage:icon];
+[browsercell setStringValue:[ NSString stringWithUTF8String:filename ]];
+[cont editCell:browsercell at:(row+lastadd) and:0];
+[cont setNeedsDisplay:YES];
+DW_MUTEX_UNLOCK;
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
-dw_container_set_item(handle, pointer, column+2, row, data);
+dw_container_set_item(handle, pointer, column+1, row, data);
 }
 /*
 * Gets column type for a container column
 * Parameters:
 *          handle: Handle to the container window (widget).
 *          column: Zero based column.
 */
 int API dw_filesystem_get_column_type(HWND handle, int column)
 {
-return dw_container_get_column_type(handle, column+2);
+return dw_container_get_column_type(handle, column+1);
 }
 /*
 * Sets the width of a column in the container.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 882:1e7b7f870d88