dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2173:8a609f6748e7

Mac: Initial code to transition from NSCell based container/tree controls. Been getting deprecation warnings about this since Yosemite 10.10 but the code has been functional so I had been ignoring it. In Big Sur 11.0 the cell based version is displaying incorrectly, instead of spending effort to fix the deprecated cell based version, investing time switching to the View based version using NSTableCellView. This code semi-works, displays briefly before getting an invalid instruction in the message loop. Committing as BUILDING_FOR_YOSEMITE1 instead of BUILDING_FOR_YOSEMITE so the code is currently disabled.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 11 Oct 2020 09:51:45 +0000
parents	a1bf891d5990
children	f93d29310b14

comparison

equal deleted inserted replaced

-:81c50388851d
+:8a609f6748e7
 -(id)scrollview { return scrollview; }
 -(void)setScrollview:(id)input { scrollview = input; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
+#ifndef BUILDING_FOR_YOSEMITE1
 /* Subclass NSTextFieldCell for displaying image and text */
 @interface DWImageAndTextCell : NSTextFieldCell
 {
 @private
 NSImage	*image;
 NSSize cellSize = [super cellSize];
 cellSize.width += (image ? [image size].width : 0) + 3;
 return cellSize;
 }
 @end
+#endif
 /* Subclass for a Container/List type */
 @interface DWContainer : NSTableView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSTableViewDataSource,NSTableViewDelegate>
 }
 return 0;
 }
 -(void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
-DWImageAndTextCell *bcell = cell;
+#ifdef BUILDING_FOR_YOSEMITE1
+NSTableCellView *bcell = cell;
+NSTextField *tcell = nil;
+/* Handle drawing image and text if necessary */
+if([cell isMemberOfClass:[NSTableCellView class]])
+{
+int index = (int)(row * [tvcols count]);
+NSTableCellView *browsercell = [data objectAtIndex:index];
+NSImage *img = [[browsercell imageView] image];
+[[bcell imageView] setImage:img];
+tcell = [bcell textField];
+}
+#else
+DWImageAndTextCell *bcell = cell, *tcell = cell;
 /* Handle drawing image and text if necessary */
 if([cell isMemberOfClass:[DWImageAndTextCell class]])
 {
 int index = (int)(row * [tvcols count]);
 DWImageAndTextCell *browsercell = [data objectAtIndex:index];
 NSImage *img = [browsercell image];
 [bcell setImage:img];
 }
-if([cell isKindOfClass:[NSTextFieldCell class]])
+#endif
+if([tcell isKindOfClass:[NSTextFieldCell class]])
 {
 /* Handle drawing alternating row colors if enabled */
 if ((row % 2) == 0)
 {
 if(evencolor)
 {
-[bcell setDrawsBackground:YES];
+[tcell setDrawsBackground:YES];
-[bcell setBackgroundColor:evencolor];
+[tcell setBackgroundColor:evencolor];
 }
 else
-[bcell setDrawsBackground:NO];
+[tcell setDrawsBackground:NO];
 }
 else
 {
 if(oddcolor)
 {
-[bcell setDrawsBackground:YES];
+[tcell setDrawsBackground:YES];
-[bcell setBackgroundColor:oddcolor];
+[tcell setBackgroundColor:oddcolor];
 }
 else
-[bcell setDrawsBackground:NO];
+[tcell setDrawsBackground:NO];
 }
 }
 }
 -(void)editCell:(id)input at:(int)row and:(int)col
 {
 {
 int x;
 for(x=0;x<rowcount;x++)
 {
+#ifdef BUILDING_FOR_YOSEMITE1
+NSTableCellView *cell = [self viewAtColumn:z row:x makeIfNecessary:YES];
+int thiswidth = NSWidth([cell frame]);
+/* If on the first column... add up the heights */
+if(z == 0)
+cheight += NSHeight([cell frame]);
+#else
 NSCell *cell = [self preparedCellAtColumn:z row:x];
 int thiswidth = [cell cellSize].width;
 /* If on the first column... add up the heights */
 if(z == 0)
 if([image isMemberOfClass:[NSImage class]])
 {
 thiswidth = [image size].width;
 }
 }
+#endif
 if(thiswidth > width)
 {
 width = thiswidth;
 }
 }
 NSCell *colcell = [column headerCell];
 int width = [colcell cellSize].width;
 for(x=0;x<rowcount;x++)
 {
+#ifdef BUILDING_FOR_YOSEMITE1
+NSTableCellView *cell = [self viewAtColumn:z row:x makeIfNecessary:YES];
+int thiswidth = NSWidth([cell frame]);
+#else
 NSCell *cell = [self preparedCellAtColumn:z row:x];
 int thiswidth = [cell cellSize].width;
 /* Check the image inside the cell to get its width */
 if([cell isMemberOfClass:[NSImageCell class]])
 if([image isMemberOfClass:[NSImage class]])
 {
 thiswidth = [image size].width;
 }
 }
+#endif
 if(thiswidth > width)
 {
 width = thiswidth;
 }
 }
 self = [super init];
 if (self)
 {
 treecol = [[NSTableColumn alloc] init];
+#ifndef BUILDING_FOR_YOSEMITE1
 DWImageAndTextCell *browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
 [treecol setDataCell:browsercell];
+#endif
 [self addTableColumn:treecol];
 [self setOutlineTableColumn:treecol];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeSelectionChanged:) name:NSOutlineViewSelectionDidChangeNotification object:self];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(treeItemExpanded:) name:NSOutlineViewItemDidExpandNotification object:self];
 }
 }
 return @"List Root";
 }
 -(void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
+#ifdef BUILDING_FOR_YOSEMITE1
+if([cell isMemberOfClass:[NSTableCellView class]])
+{
+NSMutableArray *this = (NSMutableArray *)item;
+NSImage *img = [this objectAtIndex:0];
+if([img isKindOfClass:[NSImage class]])
+[[(NSTableCellView*)cell imageView] setImage:img];
+}
+#else
 if([cell isMemberOfClass:[DWImageAndTextCell class]])
 {
 NSMutableArray *this = (NSMutableArray *)item;
 NSImage *img = [this objectAtIndex:0];
 if([img isKindOfClass:[NSImage class]])
 [(DWImageAndTextCell*)cell setImage:img];
 }
+#endif
 }
 -(BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item { return NO; }
 -(void)addTree:(NSMutableArray *)item and:(NSMutableArray *)parent after:(NSMutableArray *)after
 {
 NSMutableArray *children = data;
 [cont setup];
 for(z=0;z<count;z++)
 {
 NSTableColumn *column = [[NSTableColumn alloc] init];
+#ifdef BUILDING_FOR_YOSEMITE1
+[column setTitle:[ NSString stringWithUTF8String:titles[z] ]];
+#else
 [[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
 if(flags[z] & DW_CFA_BITMAPORICON)
 {
 NSImageCell *imagecell = [[NSImageCell alloc] init];
 [column setDataCell:imagecell];
 {
 DWImageAndTextCell *browsercell = [[DWImageAndTextCell alloc] init];
 [column setDataCell:browsercell];
 [browsercell release];
 }
+#endif
 /* Defaults to left justified so just handle right and center */
 if(flags[z] & DW_CFA_RIGHT)
 {
 [(NSCell *)[column dataCell] setAlignment:DWTextAlignmentRight];
 [(NSCell *)[column headerCell] setAlignment:DWTextAlignmentRight];
 DW_FUNCTION_NO_RETURN(dw_filesystem_set_file)
 DW_FUNCTION_RESTORE_PARAM5(handle, HWND, pointer, void *, row, int, filename, char *, icon, HICN)
 {
 DW_FUNCTION_INIT;
 DWContainer *cont = handle;
+#ifdef BUILDING_FOR_YOSEMITE1
+NSTableCellView *browsercell;
+#else
 DWImageAndTextCell *browsercell;
+#endif
 int lastadd = 0;
 /* If pointer is NULL we are getting a change request instead of set */
 if(pointer)
 {
 lastadd = [cont lastAddPoint];
 }
+#ifdef BUILDING_FOR_YOSEMITE1
+browsercell = [[[NSTableCellView alloc] init] autorelease];
+[[browsercell imageView] setImage:icon];
+[[browsercell textField] setStringValue:[ NSString stringWithUTF8String:filename ]];
+#else
 browsercell = [[[DWImageAndTextCell alloc] init] autorelease];
 [browsercell setImage:icon];
 [browsercell setStringValue:[ NSString stringWithUTF8String:filename ]];
+#endif
 [cont editCell:browsercell at:(row+lastadd) and:0];
 [cont setNeedsDisplay:YES];
 DW_FUNCTION_RETURN_NOTHING;
 }

Mercurial > dwindows

comparison mac/dw.m @ 2173:8a609f6748e7