videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-16 16:02:54 +02:00
Code Releases Activity

macosx: Separate more of audio collection view setup from VLCLibraryAudioDataSource, move into more logical VLCLibraryAudioViewController

Browse Source 
Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
This commit is contained in:
Claudio Cambra 2022-12-17 20:57:31 +01:00 committed by Felix Paul Kühne
parent f546c78ef0
commit 55c0d4933b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m
View File

@ -69,7 +69,6 @@ static NSString *VLCLibraryYearSortDescriptorKey = @"VLCLibraryYearSortDescripto
@interface VLCLibraryAudioDataSource () @interface VLCLibraryAudioDataSource ()
{ {
VLCLibraryCollectionViewFlowLayout *_collectionViewFlowLayout;
NSArray *_displayedCollection; NSArray *_displayedCollection;
enum vlc_ml_parent_type _currentParentType; enum vlc_ml_parent_type _currentParentType;
@ -306,7 +305,6 @@ static NSString *VLCLibraryYearSortDescriptorKey = @"VLCLibraryYearSortDescripto
- (void)setupCollectionView - (void)setupCollectionView
{ {
_collectionView.dataSource = self; _collectionView.dataSource = self;
_collectionView.delegate = self;
[_collectionView registerClass:[VLCLibraryCollectionViewItem class] forItemWithIdentifier:VLCLibraryCellIdentifier]; [_collectionView registerClass:[VLCLibraryCollectionViewItem class] forItemWithIdentifier:VLCLibraryCellIdentifier];
@ -324,9 +322,6 @@ static NSString *VLCLibraryYearSortDescriptorKey = @"VLCLibraryYearSortDescripto
[_collectionView registerNib:mediaItemSupplementaryDetailView [_collectionView registerNib:mediaItemSupplementaryDetailView
forSupplementaryViewOfKind:VLCLibraryCollectionViewMediaItemSupplementaryDetailViewKind forSupplementaryViewOfKind:VLCLibraryCollectionViewMediaItemSupplementaryDetailViewKind
withIdentifier:VLCLibraryCollectionViewMediaItemSupplementaryDetailViewIdentifier]; withIdentifier:VLCLibraryCollectionViewMediaItemSupplementaryDetailViewIdentifier];
_collectionViewFlowLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];
_collectionView.collectionViewLayout = _collectionViewFlowLayout;
} }
- (void)setupTableViews - (void)setupTableViews
@ -431,7 +426,11 @@ static NSString *VLCLibraryYearSortDescriptorKey = @"VLCLibraryYearSortDescripto
- (void)reloadViews - (void)reloadViews
{ {
[_collectionViewFlowLayout resetLayout]; VLCLibraryCollectionViewFlowLayout *collectionViewFlowLayout = (VLCLibraryCollectionViewFlowLayout *)_collectionView.collectionViewLayout;
if (collectionViewFlowLayout) {
[collectionViewFlowLayout resetLayout];
}
[self.collectionView reloadData]; [self.collectionView reloadData];
[self.collectionSelectionTableView reloadData]; [self.collectionSelectionTableView reloadData];
[self.groupSelectionTableView reloadData]; [self.groupSelectionTableView reloadData];

9
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
View File

@ -24,6 +24,8 @@
#import "main/VLCMain.h" #import "main/VLCMain.h"
#import "extensions/NSString+Helpers.h" #import "extensions/NSString+Helpers.h"
#import "library/VLCLibraryCollectionViewDelegate.h"
#import "library/VLCLibraryCollectionViewFlowLayout.h"
#import "library/VLCLibraryController.h" #import "library/VLCLibraryController.h"
#import "library/VLCLibraryModel.h" #import "library/VLCLibraryModel.h"
#import "library/VLCLibraryNavigationStack.h" #import "library/VLCLibraryNavigationStack.h"
@ -34,6 +36,8 @@
{ {
NSArray<NSString *> *_placeholderImageNames; NSArray<NSString *> *_placeholderImageNames;
NSArray<NSString *> *_placeholderLabelStrings; NSArray<NSString *> *_placeholderLabelStrings;
VLCLibraryCollectionViewDelegate *_audioLibraryCollectionViewDelegate;
} }
@end @end
@ -100,6 +104,11 @@
_audioLibraryCollectionView.selectable = YES; _audioLibraryCollectionView.selectable = YES;
_audioLibraryCollectionView.allowsMultipleSelection = NO; _audioLibraryCollectionView.allowsMultipleSelection = NO;
_audioLibraryCollectionView.allowsEmptySelection = YES; _audioLibraryCollectionView.allowsEmptySelection = YES;
_audioLibraryCollectionViewDelegate = [[VLCLibraryCollectionViewDelegate alloc] init];
_audioLibraryCollectionView.delegate = _audioLibraryCollectionViewDelegate;
_audioLibraryCollectionView.collectionViewLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];
} }
- (void)setupAudioTableViews - (void)setupAudioTableViews