- Add some NSOutlineView logic to prevent disclosure triangles from displaying on 10.5 for the quick connect item and favourites title; thanks to schlabberdog for both reporting and testing this issue

2 files changed, 12 insertions, 0 deletions

diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m
index 38137b1b..e986b271 100644
--- a/Source/SPConnectionControllerDelegate.m
+++ b/Source/SPConnectionControllerDelegate.m
@@ -240,6 +240,11 @@ static NSString *SPQuickConnectImageWhite = @"quick-connect-icon-white.pdf";
 	return YES;
 }
 
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+{
+	return (item != quickConnectItem && ![item isLeaf]);
+}
+
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item
 {
 	return ([[item parentNode] parentNode] != nil);
diff --git a/Source/SPFavoritesOutlineView.m b/Source/SPFavoritesOutlineView.m
index 69800606..3688f769 100644
--- a/Source/SPFavoritesOutlineView.m
+++ b/Source/SPFavoritesOutlineView.m
@@ -121,6 +121,13 @@ static NSUInteger SPFavoritesOutlineViewUnindent = 14;
 {
 	NSRect superFrame = [super frameOfOutlineCellAtRow:rowIndex];
 
+	// Return NSZeroRect if the row is a group row
+	if ([[self delegate] respondsToSelector:@selector(outlineView:isGroupItem:)]) {
+		if ([[self delegate] outlineView:self isGroupItem:[self itemAtRow:rowIndex]]) {
+			return NSZeroRect;
+		}
+	}
+
 	// On versions of Lion or above, amend the padding appropriately
 	if (systemVersion >= 0x1070 && superFrame.origin.x > SPFavoritesOutlineViewUnindent) {
 		return NSMakeRect(superFrame.origin.x - SPFavoritesOutlineViewUnindent, superFrame.origin.y, superFrame.size.width, superFrame.size.height);