MacGui: use a view-based outline view in the presets drawer.

1 files changed, 29 insertions, 37 deletions

diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m
index 8933c7e27..532968692 100644
--- a/macosx/HBPresetsViewController.m
+++ b/macosx/HBPresetsViewController.m
@@ -11,6 +11,35 @@
 // drag and drop pasteboard type
 #define kHandBrakePresetPBoardType @"handBrakePresetPBoardType"
 
+@interface HBPresetCellView : NSTableCellView
+@end
+
+@implementation HBPresetCellView
+
+- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle
+{
+    [super setBackgroundStyle:backgroundStyle];
+
+    // Customize the built-in preset text color
+    if ([self.objectValue isBuiltIn])
+    {
+        if (backgroundStyle == NSBackgroundStyleDark)
+        {
+            self.textField.textColor = [NSColor selectedControlTextColor];
+        }
+        else
+        {
+            self.textField.textColor = [NSColor blueColor];
+        }
+    }
+    else
+    {
+        self.textField.textColor = [NSColor controlTextColor];
+    }
+}
+
+@end
+
 @interface HBPresetsViewController () <NSOutlineViewDelegate>
 
 @property (nonatomic, strong) HBPresetsManager *presets;
@@ -253,43 +282,6 @@
     [self expandNodes:[self.treeController.arrangedObjects childNodes]];
 }
 
-#pragma mark - Added Functionality (optional)
-
-/* We use this to provide tooltips for the items in the presets outline view */
-- (NSString *)outlineView:(NSOutlineView *)fPresetsOutlineView
-           toolTipForCell:(NSCell *)cell
-                     rect:(NSRectPointer)rect
-              tableColumn:(NSTableColumn *)tc
-                     item:(id)item
-            mouseLocation:(NSPoint)mouseLocation
-{
-    return [[item representedObject] presetDescription];
-}
-
-/* Use to customize the font and display characteristics of the title cell */
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{
-    NSColor *fontColor;
-    
-    if ([self.outlineView selectedRow] == [self.outlineView rowForItem:item])
-    {
-        fontColor = [NSColor blackColor];
-    }
-    else
-    {
-        if ([[item representedObject] isBuiltIn])
-        {
-            fontColor = [NSColor blueColor];
-        }
-        else // User created preset, use a black font
-        {
-            fontColor = [NSColor blackColor];
-        }
-    }
-
-    [cell setTextColor:fontColor];
-}
-
 #pragma mark - Expanded node persistence methods
 
 - (void)expandNodes:(NSArray *)childNodes