Skip to content
Snippets Groups Projects
Commit e6916053 authored by Claudio Cambra's avatar Claudio Cambra Committed by Steve Lhomme
Browse files

macosx: Do not store loading overlay view property in audio view controller


Signed-off-by: default avatarClaudio Cambra <developer@claudiocambra.com>
parent a0cc8f25
No related branches found
Tags 3.1.5
1 merge request!6136macosx: Unify handling of various view's presentation
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
@class VLCLibraryAudioDataSource; @class VLCLibraryAudioDataSource;
@class VLCLibraryAudioGroupDataSource; @class VLCLibraryAudioGroupDataSource;
@class VLCLoadingOverlayView;
@class VLCLibraryWindow; @class VLCLibraryWindow;
@protocol VLCMediaLibraryItemProtocol; @protocol VLCMediaLibraryItemProtocol;
...@@ -51,7 +50,6 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -51,7 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly, weak) NSTableView *audioLibraryGridModeSplitViewListTableView; @property (readonly, weak) NSTableView *audioLibraryGridModeSplitViewListTableView;
@property (readonly, weak) NSScrollView *audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView; @property (readonly, weak) NSScrollView *audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView;
@property (readonly, weak) NSCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView; @property (readonly, weak) NSCollectionView *audioLibraryGridModeSplitViewListSelectionCollectionView;
@property (readonly, weak) VLCLoadingOverlayView *loadingOverlayView;
@property (readonly) VLCLibraryAudioDataSource *audioDataSource; @property (readonly) VLCLibraryAudioDataSource *audioDataSource;
@property (readonly) VLCLibraryAudioGroupDataSource *audioGroupDataSource; @property (readonly) VLCLibraryAudioGroupDataSource *audioGroupDataSource;
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#import "main/VLCMain.h" #import "main/VLCMain.h"
#import "views/VLCLoadingOverlayView.h"
#import "views/VLCNoResultsLabel.h" #import "views/VLCNoResultsLabel.h"
#import "windows/video/VLCVoutView.h" #import "windows/video/VLCVoutView.h"
...@@ -154,7 +153,6 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi ...@@ -154,7 +153,6 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
_audioLibraryGridModeSplitViewListTableView = libraryWindow.audioLibraryGridModeSplitViewListTableView; _audioLibraryGridModeSplitViewListTableView = libraryWindow.audioLibraryGridModeSplitViewListTableView;
_audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView = libraryWindow.audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView; _audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView = libraryWindow.audioLibraryGridModeSplitViewListSelectionCollectionViewScrollView;
_audioLibraryGridModeSplitViewListSelectionCollectionView = libraryWindow.audioLibraryGridModeSplitViewListSelectionCollectionView; _audioLibraryGridModeSplitViewListSelectionCollectionView = libraryWindow.audioLibraryGridModeSplitViewListSelectionCollectionView;
_loadingOverlayView = libraryWindow.loadingOverlayView;
} }
- (void)setupAudioDataSource - (void)setupAudioDataSource
...@@ -332,8 +330,9 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi ...@@ -332,8 +330,9 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
} }
self.emptyLibraryView.translatesAutoresizingMaskIntoConstraints = NO; self.emptyLibraryView.translatesAutoresizingMaskIntoConstraints = NO;
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) { if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.emptyLibraryView, self.loadingOverlayView]; self.libraryTargetView.subviews =
@[self.emptyLibraryView, self.libraryWindow.loadingOverlayView];
} else { } else {
self.libraryTargetView.subviews = @[self.emptyLibraryView]; self.libraryTargetView.subviews = @[self.emptyLibraryView];
} }
...@@ -352,8 +351,8 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi ...@@ -352,8 +351,8 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
_noResultsLabel.translatesAutoresizingMaskIntoConstraints = NO; _noResultsLabel.translatesAutoresizingMaskIntoConstraints = NO;
} }
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) { if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[_noResultsLabel, self.loadingOverlayView]; self.libraryTargetView.subviews = @[_noResultsLabel, self.libraryWindow.loadingOverlayView];
} else { } else {
self.libraryTargetView.subviews = @[_noResultsLabel]; self.libraryTargetView.subviews = @[_noResultsLabel];
} }
...@@ -367,8 +366,8 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi ...@@ -367,8 +366,8 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
- (void)prepareAudioLibraryView - (void)prepareAudioLibraryView
{ {
self.audioLibraryView.translatesAutoresizingMaskIntoConstraints = NO; self.audioLibraryView.translatesAutoresizingMaskIntoConstraints = NO;
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) { if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.audioLibraryView, self.loadingOverlayView]; self.libraryTargetView.subviews = @[self.audioLibraryView, self.libraryWindow.loadingOverlayView];
} else { } else {
self.libraryTargetView.subviews = @[self.audioLibraryView]; self.libraryTargetView.subviews = @[self.audioLibraryView];
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment