WIP moving from IKImageBrowserViews to NSCollectionViews.

Stacksmith/Platforms/Mac/WILDMediaListDataSource.h

@@ -17,7 +17,6 @@ namespace Carlson
 };
 
 
-@class IKImageBrowserView;
 @class WILDMediaListDataSource;
 
 
@@ -29,18 +28,18 @@ namespace Carlson
 @end
 
 
-@interface WILDMediaListDataSource : NSObject
+@interface WILDMediaListDataSource : NSObject <NSCollectionViewDataSource, NSCollectionViewDelegate>
 {
 	Carlson::CDocument*		mDocument;			// This is who we get the icons from.
 	NSMutableArray*			mIcons;				// Cached lists of icon names/IDs.
-	IKImageBrowserView*		mIconListView;		// View in which we show the icons.
+	NSCollectionView*		mIconListView;		// View in which we show the icons.
 	NSTextField*			mImagePathField;	// Field where we show where the icon comes from.
 	id<WILDMediaListDataSourceDelegate>	mDelegate;
 	Carlson::TMediaType		mMediaType;			// Type of media to display, i.e. icons, cursors etc.
 }
 
 @property (assign,nonatomic) Carlson::CDocument*				document;
-@property (retain,nonatomic) IBOutlet IKImageBrowserView*		iconListView;
+@property (retain,nonatomic) IBOutlet NSCollectionView*			iconListView;
 @property (retain,nonatomic) IBOutlet NSTextField*				imagePathField;
 @property (assign,nonatomic) id<WILDMediaListDataSourceDelegate>	delegate;
 @property (assign,nonatomic) Carlson::TMediaType				mediaType;

Stacksmith/Platforms/Mac/WILDMediaListDataSource.mm

@@ -16,7 +16,7 @@
 using namespace Carlson;
 
 
-@interface WILDSimpleImageBrowserItem : NSObject // IKImageBrowserItem
+@interface WILDSimpleImageBrowserItem : NSObject
 {
 	NSString*					mName;
 	NSString*					mFileName;
@@ -142,7 +142,7 @@ -(void)	dealloc
 }
 
 
--(void)	setIconListView: (IKImageBrowserView*)inIconListView
+-(void)	setIconListView: (NSCollectionView *)inIconListView
 {
 	if( mIconListView != inIconListView )
 	{
@@ -216,8 +216,7 @@ -(void)	setSelectedIconID: (ObjectID)theID
 	{
 		if( sibi.pictureID == theID )
 		{
-			[mIconListView setSelectionIndexes: [NSIndexSet indexSetWithIndex: x] byExtendingSelection: NO];
-			[mIconListView scrollIndexToVisible: x];
+			[mIconListView selectItemsAtIndexPaths: [NSIndexPath indexPathWithIndexes: x] scrollPosition: NSCollectionViewScrollPositionCenteredVertically];
 			break;
 		}
 		x++;
@@ -232,23 +231,33 @@ -(ObjectID)	selectedIconID
 }
 
 
--(NSUInteger) numberOfItemsInImageBrowser: (IKImageBrowserView *)aBrowser
+-(NSInteger)	collectionView: (NSCollectionView *)collectionView numberOfItemsInSection: (NSInteger)section
 {
 	[self ensureIconListExists];
 
 	return [mIcons count];
 }
 
 
--(id /*IKImageBrowserItem*/) imageBrowser: (IKImageBrowserView *) aBrowser itemAtIndex: (NSUInteger)idx
+- (NSCollectionViewItem *)collectionView:(NSCollectionView *)collectionView itemForRepresentedObjectAtIndexPath:(NSIndexPath *)indexPath
 {
-	[self ensureIconListExists];
-
-	return [mIcons objectAtIndex: idx];
+	[mIcons objectAtIndex: [indexPath indexAtPosition: 1]];
+}
+
+
+-(void)	collectionView: (NSCollectionView *)collectionView didSelectItemsAtIndexPaths: (NSSet<NSIndexPath *> *)indexPaths
+{
+	[self selectionDidChange];
+}
+
+
+-(void)	collectionView: (NSCollectionView *)collectionView didDeselectItemsAtIndexPaths: (NSSet<NSIndexPath *> *)indexPaths
+{
+	[self selectionDidChange];
 }
 
 
--(void)	imageBrowserSelectionDidChange: (IKImageBrowserView *)aBrowser
+-(void)	selectionDidChange
 {
 	NSInteger							selectedIndex = [[mIconListView selectionIndexes] firstIndex];
 	if( selectedIndex != NSNotFound )
@@ -283,9 +292,8 @@ -(IBAction)	paste: (id)sender
 		NSString*	imgFileURLStr = [NSString stringWithUTF8String: filePath.c_str()];
 		NSURL*		imgFileURL = [NSURL URLWithString: imgFileURLStr];
 
-		[theImg lockFocus];
-			NSBitmapImageRep	*	bir = [[NSBitmapImageRep alloc] initWithFocusedViewRect: NSMakeRect(0,0,theImg.size.width,theImg.size.height)];
-		[theImg unlockFocus];
+		CGImageRef imageRef = [theImg CGImageForProposedRect:NULL context:NULL hints:nil];
+		NSBitmapImageRep *bir = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
 		NSData	*	pngData = [bir representationUsingType: NSBitmapImageFileTypePNG properties: @{}];
 		[pngData writeToURL: imgFileURL atomically: YES];
 
@@ -348,9 +356,8 @@ - (BOOL)performDragOperation: (id <NSDraggingInfo>)sender
 			NSString*	imgFileURLStr = [NSString stringWithUTF8String: filePath.c_str()];
 			NSURL*		imgFileURL = [NSURL URLWithString: imgFileURLStr];
 
-			[theImg lockFocus];
-				NSBitmapImageRep	*	bir = [[NSBitmapImageRep alloc] initWithFocusedViewRect: NSMakeRect(0,0,theImg.size.width,theImg.size.height)];
-			[theImg unlockFocus];
+			CGImageRef imageRef = [theImg CGImageForProposedRect:NULL context:NULL hints:nil];
+			NSBitmapImageRep *bir = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
 			NSData	*	pngData = [bir representationUsingType: NSBitmapImageFileTypePNG properties: @{}];
 			[pngData writeToURL: imgFileURL atomically: YES];
 
@@ -376,9 +383,8 @@ - (BOOL)performDragOperation: (id <NSDraggingInfo>)sender
 			NSString*	imgFileURLStr = [NSString stringWithUTF8String: filePath.c_str()];
 			NSURL*		imgFileURL = [NSURL URLWithString: imgFileURLStr];
 
-			[theImg lockFocus];
-				NSBitmapImageRep	*	bir = [[NSBitmapImageRep alloc] initWithFocusedViewRect: NSMakeRect(0,0,theImg.size.width,theImg.size.height)];
-			[theImg unlockFocus];
+			CGImageRef imageRef = [theImg CGImageForProposedRect:NULL context:NULL hints:nil];
+			NSBitmapImageRep *bir = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
 			NSData	*	pngData = [bir representationUsingType: NSBitmapImageFileTypePNG properties: @{}];
 			[pngData writeToURL: imgFileURL atomically: YES];
 

Stacksmith/Platforms/Mac/WILDStackCanvasWindowController.mm

@@ -79,7 +79,7 @@ -(void)	windowDidLoad
 
 	[self reloadData];
 
-	[self.stackCanvasView registerForDraggedTypes: [NSImage.imageTypes arrayByAddingObjectsFromArray: @[ NSFilenamesPboardType ]]];
+	[self.stackCanvasView registerForDraggedTypes: [NSImage.imageTypes arrayByAddingObjectsFromArray: @[ (NSString *)kUTTypeFileURL ]]];
 }
 
 
@@ -447,9 +447,8 @@ -(void)	addImages: (NSArray<NSImage*>*)images
 		NSString*	imgFileURLStr = [NSString stringWithUTF8String: filePath.c_str()];
 		NSURL*		imgFileURL = [NSURL URLWithString: imgFileURLStr];
 
-		[theImg lockFocus];
-			NSBitmapImageRep	*	bir = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: NSMakeRect(0,0,theImg.size.width,theImg.size.height)] autorelease];
-		[theImg unlockFocus];
+		CGImageRef imageRef = [theImg CGImageForProposedRect:NULL context:NULL hints:nil];
+		NSBitmapImageRep *bir = [[NSBitmapImageRep alloc] initWithCGImage: imageRef];
 		NSData	*	pngData = [bir representationUsingType: NSBitmapImageFileTypePNG properties: @{}];
 		[pngData writeToURL: imgFileURL atomically: YES];
 		newIcon.mMediaID = pictureID;

Stacksmith/Platforms/Mac/WILDTemplateProjectPickerController.h

@@ -9,16 +9,13 @@
 #import <Cocoa/Cocoa.h>
 
 
-@class IKImageBrowserView;
-
-
-@interface WILDTemplateProjectPickerController : NSWindowController
+@interface WILDTemplateProjectPickerController : NSWindowController <NSCollectionViewDataSource>
 {
 	NSMutableArray	*	groups;
 	NSMutableArray	*	items;
 }
 
-@property (assign,nonatomic) IBOutlet IKImageBrowserView*	iconListView;
+@property (assign,nonatomic) IBOutlet NSCollectionView*	iconListView;
 @property (copy,nonatomic) void	(^callbackHandler)( NSString* inPickedFilePath );
 
 -(IBAction)	doOK: (id)sender;

Stacksmith/Platforms/Mac/WILDTemplateProjectPickerController.m

@@ -11,11 +11,7 @@
 #import "UKHelperMacros.h"
 
 
-@interface WILDTemplateProjectPickerController ()
-
-@end
-
-@interface WILDSimpleTemplateProjectBrowserItem : NSObject // IKImageBrowserItem
+@interface WILDSimpleTemplateProjectBrowserItem : NSObject
 {
 	NSImage*					mImage;
 	NSString*					mName;
@@ -114,32 +110,28 @@ -(void)	ensureItemsListExists
 			[[NSApplication sharedApplication] presentError: err];
 		}
 
-		NSInteger		groupCount = 0;
-		NSInteger		itemCount = 0;
-
 		for( NSString* currSubfolderSubPath in subfolderpaths )
 		{
 			NSString	*	currSubfolderPath = [templatesPath stringByAppendingPathComponent: currSubfolderSubPath];
 			NSArray*		subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: currSubfolderPath error: &err];
 
-			NSUInteger	startItemCount = itemCount;
 
+			if( !subpaths )
+			{
+				continue;
+			}
+
+			NSMutableArray<WILDSimpleTemplateProjectBrowserItem *> *groupContents = [NSMutableArray new];
+
+			[groups addObject: @{ @"name": currSubfolderSubPath, @"contents": groupContents } ];
+
 			for( NSString* currSubPath in subpaths )
 			{
 				NSString	*	currPath = [currSubfolderPath stringByAppendingPathComponent: currSubPath];
 				WILDSimpleTemplateProjectBrowserItem	*	tbi = [[[WILDSimpleTemplateProjectBrowserItem alloc] init] autorelease];
 				tbi.filename = currPath;
 				tbi.name = [[currPath lastPathComponent] stringByDeletingPathExtension];
-				[items addObject: tbi];
-
-				itemCount++;
-			}
-
-			if( subpaths )
-			{
-				groupCount++;
-
-				[groups addObject: @{ IKImageBrowserGroupRangeKey: [NSValue valueWithRange: (NSRange){ startItemCount, itemCount -startItemCount }], IKImageBrowserGroupTitleKey: currSubfolderSubPath, IKImageBrowserGroupStyleKey: @(IKGroupDisclosureStyle) } ];
+				[groupContents addObject: tbi];
 			}
 		}
 	}
@@ -156,45 +148,35 @@ -(void)	windowDidLoad
 }
 
 
--(NSUInteger) numberOfItemsInImageBrowser: (IKImageBrowserView *)aBrowser
+- (NSInteger)collectionView:(NSCollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
 {
 	[self ensureItemsListExists];
 
-	return [items count];
+	NSDictionary *group = groups[ section ];
+	return [(NSArray *)group[@"contents"] count];
 }
 
 
--(id /*IKImageBrowserItem*/) imageBrowser: (IKImageBrowserView *) aBrowser itemAtIndex: (NSUInteger)idx
+- (NSCollectionViewItem *)collectionView:(NSCollectionView *)collectionView itemForRepresentedObjectAtIndexPath:(NSIndexPath *)indexPath
 {
 	[self ensureItemsListExists];
 
-	return [items objectAtIndex: idx];
+	NSDictionary *group = groups[ [indexPath indexAtPosition:0] ];
+
+	NSCollectionViewItem *theItem = [collectionView makeItemWithIdentifier: @"StandardItem" forIndexPath: indexPath];
+
+	theItem.representedObject = group[@"contents"][ [indexPath indexAtPosition: 1] ];
+
+	return theItem;
 }
 
 
-- (NSUInteger) numberOfGroupsInImageBrowser:(IKImageBrowserView *) aBrowser
+- (NSInteger)numberOfSectionsInCollectionView:(NSCollectionView *)collectionView
 {
 	return groups.count;
 }
 
 
-/*!
-	@method imageBrowser:groupAtIndex:
-	@abstract Returns the group at index 'index'
-	@discussion A group is defined by a dictionay. Keys for this dictionary are defined below.
-*/
-- (NSDictionary *) imageBrowser:(IKImageBrowserView *) aBrowser groupAtIndex:(NSUInteger) index
-{
-	return groups[index];
-}
-
-
--(void)	imageBrowserSelectionDidChange: (IKImageBrowserView *)aBrowser
-{
-
-}
-
-
 -(IBAction)	doOK: (id)sender
 {
 	[self close];