From 35d4df9ca2f107fb862e41e5c35a161b90c3a257 Mon Sep 17 00:00:00 2001 From: vspader Date: Sat, 16 Feb 2008 01:44:01 +0000 Subject: [PATCH] Added fix that brings back table columns for those that lost them in previous versions. --- Playlist/PlaylistView.m | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Playlist/PlaylistView.m b/Playlist/PlaylistView.m index 9f0e5b044..de4ed539e 100644 --- a/Playlist/PlaylistView.m +++ b/Playlist/PlaylistView.m @@ -68,20 +68,26 @@ NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"headerCell.title" ascending:YES]; NSArray *sortDescriptors = [NSArray arrayWithObject:sortDescriptor]; - NSEnumerator *e = [[[self tableColumns] sortedArrayUsingDescriptors: sortDescriptors] objectEnumerator]; - + [sortDescriptor release]; + + int visibleTableColumns = 0; int menuIndex = 0; - NSTableColumn *col; - while (col = [e nextObject]) { + for (NSTableColumn *col in [[self tableColumns] sortedArrayUsingDescriptors: sortDescriptors]) { NSMenuItem *contextMenuItem = [headerContextMenu insertItemWithTitle:[[col headerCell] title] action:@selector(toggleColumn:) keyEquivalent:@"" atIndex:menuIndex]; [contextMenuItem setTarget:self]; [contextMenuItem setRepresentedObject:col]; [contextMenuItem setState:([col isHidden] ? NSOffState : NSOnState)]; + visibleTableColumns += ![col isHidden]; menuIndex++; } - [sortDescriptor release]; + + if (visibleTableColumns == 0) { + for (NSTableColumn *col in [self tableColumns]) { + [col setHidden:NO]; + } + } [[self headerView] setMenu:headerContextMenu]; }