Ticket #1134: Colloquy-1134-take2.patch

Views/JVSideOutlineView.m

@@ -10 +10 @@
-                outData[i] = ( 1. - a ) * dark[i] + a * light[i];
-}
-
+@interface NSOutlineView (InternalMethodsColloquyOverridesPreLeopard)
+- (NSColor *)_highlightColorForCell:(NSCell *)cell;
+- (void)_highlightRow:(int)row clipRect:(NSRect)clip;
+@end
+
-@implementation JVSideOutlineView
-- (NSColor *) _highlightColorForCell:(NSCell *) cell {
+    if ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) && [NSOutlineView instancesRespondToSelector:@selector(_highlightColorForCell:)]) {
+        return [super _highlightColorForCell:cell];
+    }
+
-    // return nil to prevent normal selection drawing
-    return nil;
-}
-
-- (void) _highlightRow:(int) row clipRect:(NSRect) clip {
+        if ((floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) && [NSOutlineView instancesRespondToSelector:@selector(_highlightRow:clipRect:)]) {
+                [super _highlightRow:row clipRect:clip];
+                return;
+        }
+        
-        NSRect highlight = [self rectOfRow:row];
-
-        struct CGFunctionCallbacks callbacks = { 0, gradientInterpolate, NULL };
@@ -41 +55 @@
-}
-
-- (void) drawBackgroundInClipRect:(NSRect) clipRect {
+        if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
+                [super drawBackgroundInClipRect:clipRect];
+                return;
+        }
+        
-        static NSColor *backgroundColor = nil;
-        if( ! backgroundColor )
-                backgroundColor = [[NSColor colorWithCalibratedRed:( 229. / 255. ) green:( 237. / 255. ) blue:( 247. / 255. ) alpha:1.] retain];

Controllers/JVChatWindowController.m

@@ -12 +12 @@
-NSString *JVToolbarToggleChatDrawerItemIdentifier = @"JVToolbarToggleChatDrawerItem";
-NSString *JVChatViewPboardType = @"Colloquy Chat View v1.0 pasteboard type";
-
+#pragma mark -
+
+#if !defined(MAC_OS_X_VERSION_10_5) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
+
+enum {
+        NSTableViewSelectionHighlightStyleRegular = 0,
+        NSTableViewSelectionHighlightStyleSourceList = 1,
+};
+typedef int NSTableViewSelectionHighlightStyle;
+
+@interface NSTableView (LeopardMethodsForBuildingWithPreLeopardSDK)
+- (void)setSelectionHighlightStyle:(NSTableViewSelectionHighlightStyle)value;
+- (NSTableViewSelectionHighlightStyle)selectionHighlightStyle;
+@end
+#endif
+
-@interface NSToolbar (NSToolbarPrivate)
-- (NSView *) _toolbarView;
-@end
@@ -72 +88 @@
-        [chatViewsOutlineView registerForDraggedTypes:[NSArray arrayWithObjects:JVChatViewPboardType, NSFilenamesPboardType, nil]];
-        [chatViewsOutlineView setMenu:[[[NSMenu allocWithZone:nil] initWithTitle:@""] autorelease]];
-
+        if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4) {
+                [chatViewsOutlineView setSelectionHighlightStyle:NSTableViewSelectionHighlightStyleSourceList];
+        }
+        
-        [favoritesButton setMenu:[MVConnectionsController favoritesMenu]];
-
-        [self setShouldCascadeWindows:NO];