Changeset 3777

Timestamp:

02/06/08 09:04:24 (6 months ago)

Author:

timothy

Message:

Use correct source list style on Leopard. Patch by eschaton. #1134

Files:

• trunk/Controllers/JVChatWindowController.m (modified) (2 diffs)
• trunk/Views/JVSideOutlineView.m (modified) (3 diffs)

trunk/Controllers/JVChatWindowController.m

@@ -12 +12 @@
-NSString *JVToolbarToggleChatDrawerItemIdentifier = @"JVToolbarToggleChatDrawerItem";
-NSString *JVChatViewPboardType = @"Colloquy Chat View v1.0 pasteboard type";
+
+#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 (NewLeopardMethods)
+- (void) setSelectionHighlightStyle:(NSTableViewSelectionHighlightStyle) value;
+- (NSTableViewSelectionHighlightStyle) selectionHighlightStyle;
+@end
+#endif
+
+#pragma mark -
-
-@interface NSToolbar (NSToolbarPrivate)
@@ -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]];

trunk/Views/JVSideOutlineView.m

@@ -11 +11 @@
-}
-
+@interface NSOutlineView (NSOutlineViewPrivate)
+- (NSColor *) _highlightColorForCell:(NSCell *) cell;
+- (void) _highlightRow:(int) row clipRect:(NSRect) clip;
+@end
+
-@implementation JVSideOutlineView
-- (NSColor *) _highlightColorForCell:(NSCell *) cell {
+        if( floor( NSAppKitVersionNumber ) > NSAppKitVersionNumber10_4 && [super respondsToSelector:_cmd] )
+                return [super _highlightColorForCell:cell];
+
-    // return nil to prevent normal selection drawing
-    return nil;
@@ -18 +26 @@
-
-- (void) _highlightRow:(int) row clipRect:(NSRect) clip {
+        if( floor( NSAppKitVersionNumber ) > NSAppKitVersionNumber10_4 && [super respondsToSelector:_cmd] )
+                return [super _highlightRow:row clipRect:clip];
+
-        NSRect highlight = [self rectOfRow:row];
-
@@ -42 +53 @@
-
-- (void) drawBackgroundInClipRect:(NSRect) clipRect {
+        if( floor( NSAppKitVersionNumber ) > NSAppKitVersionNumber10_4 && [super respondsToSelector:_cmd] )
+                return [super drawBackgroundInClipRect:clipRect];
+
-        static NSColor *backgroundColor = nil;
-        if( ! backgroundColor )
-                backgroundColor = [[NSColor colorWithCalibratedRed:( 229. / 255. ) green:( 237. / 255. ) blue:( 247. / 255. ) alpha:1.] retain];
+
-        [backgroundColor set];
-        NSRectFill( clipRect );