Apple-2-Tools
/
ample
mirror of https://github.com/ksherlock/ample.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

animate out out the entire category when it's completely invalidated.

This commit is contained in:
Kelvin Sherlock 2021-07-10 01:45:03 -04:00
parent 5a098b9d00
commit c7d0a2aecb
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Ample/MediaViewController.m
View File

@ -301,7 +301,7 @@ enum {
@interface MediaViewController () { @interface MediaViewController () {
MediaCategory *_data[CATEGORY_COUNT]; MediaCategory *_data[CATEGORY_COUNT];
NSArray *_root; NSMutableArray *_root;
Media _media; Media _media;
BOOL _loadingBookmark; BOOL _loadingBookmark;
@ -331,7 +331,7 @@ enum {
for (unsigned i = 0; i < CATEGORY_COUNT; ++i) for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
[_data[i] setCategory: i]; [_data[i] setCategory: i];
_root = @[]; _root = [NSMutableArray new];
} }
@ -694,12 +694,23 @@ static NSString *kDragType = @"private.ample.media";
MediaCategory *cat = [_outlineView parentForItem: item]; MediaCategory *cat = [_outlineView parentForItem: item];
[_outlineView beginUpdates]; [_outlineView beginUpdates];
[cat pruneChildren]; [cat pruneChildren];
// remove the entire category??
if (![cat validCount] && ![cat count]) {
NSUInteger ix = [_root indexOfObject: cat];
if (ix != NSNotFound) {
NSIndexSet *set = [NSIndexSet indexSetWithIndex: ix];
[_outlineView removeItemsAtIndexes: set
inParent: nil
withAnimation: NSTableViewAnimationEffectFade];
[_root removeObjectAtIndex: ix];
}
}
[_outlineView endUpdates]; [_outlineView endUpdates];
} }
// todo -- if this eliminates a category completely, it will still be included
// since we're now using animaations instead of reloading.
[self rebuildArgs]; [self rebuildArgs];
} }