chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Bug Fix: Rework playlist setup again

Browse source 
In case playlist setup is reset or not, move the reset above the menu
setup code, so the menu is set up correctly if a reset occurs.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-02-15 20:23:29 -08:00
parent f239784bf2
commit b8698ea125
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Playlist/PlaylistView.m
View file

@ -111,6 +111,26 @@ static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0";
}
}
int visibleTableColumns = 0;
columns = [self tableColumns];
for (NSTableColumn *col in columns) {
visibleTableColumns += ![col isHidden];
}
if(visibleTableColumns == 0) {
// Reset to defaults
NSString *message = @"Reset playlist columns to default";
DLog(@"%@", message);
[[FIRCrashlytics crashlytics] logWithFormat:@"%@", message];
for(NSTableColumn *col in columns) {
[self removeTableColumn:col];
}
columns = oldColumns;
for(NSTableColumn *col in columns) {
[self addTableColumn:col];
}
}
columns = [self tableColumns];
for(NSTableColumn *col in columns) {
@ -127,7 +147,6 @@ static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0";
ascending:YES];
NSArray *sortDescriptors = @[sortDescriptor];
int visibleTableColumns = 0;
int menuIndex = 0;
for(NSTableColumn *col in [columns sortedArrayUsingDescriptors:sortDescriptors]) {
NSString *title;
@ -149,24 +168,9 @@ static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0";
[contextMenuItem setRepresentedObject:col];
[contextMenuItem setState:([col isHidden] ? NSControlStateValueOff : NSControlStateValueOn)];
visibleTableColumns += ![col isHidden];
menuIndex++;
}
if(visibleTableColumns == 0) {
// Reset to defaults
NSString *message = @"Reset playlist columns to default";
DLog(@"%@", message);
[[FIRCrashlytics crashlytics] logWithFormat:@"%@", message];
for(NSTableColumn *col in columns) {
[self removeTableColumn:col];
}
columns = oldColumns;
for(NSTableColumn *col in columns) {
[self addTableColumn:col];
}
}
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tableColumnsResized) name:NSTableViewColumnDidResizeNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tableColumnsMoved) name:NSTableViewColumnDidMoveNotification object:nil];