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

macosx: Use library window's loading overlay view in video view controller


Signed-off-by: default avatarClaudio Cambra <developer@claudiocambra.com>
parent 519f02bf
No related branches found
No related tags found
1 merge request!6136macosx: Unify handling of various view's presentation
......@@ -45,8 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly, weak) NSTableView *videoLibraryGroupSelectionTableView;
@property (readonly, weak) NSScrollView *videoLibraryGroupsTableViewScrollView;
@property (readonly, weak) NSTableView *videoLibraryGroupsTableView;
@property (readonly) VLCLoadingOverlayView *loadingOverlayView;
@property (readonly, weak) VLCLoadingOverlayView *loadingOverlayView;
@property (readonly, nullable) VLCLibraryVideoDataSource *libraryVideoDataSource;
@property (readonly, nullable) VLCLibraryShowsDataSource *libraryShowsDataSource;
......
......@@ -66,7 +66,6 @@
id<VLCMediaLibraryItemProtocol> _awaitingPresentingLibraryItem;
NSArray<NSLayoutConstraint *> *_internalPlaceholderImageViewSizeConstraints;
NSArray<NSLayoutConstraint *> *_loadingOverlayViewConstraints;
VLCNoResultsLabel *_noResultsLabel;
}
......@@ -87,7 +86,6 @@
[self setupCollectionView];
[self setupVideoPlaceholderView];
[self setupVideoLibraryViews];
[self setupLoadingOverlayView];
NSNotificationCenter *notificationCenter = NSNotificationCenter.defaultCenter;
[notificationCenter addObserver:self
......@@ -136,6 +134,7 @@
_videoLibraryGroupSelectionTableView = libraryWindow.videoLibraryGroupSelectionTableView;
_videoLibraryGroupsTableViewScrollView = libraryWindow.videoLibraryGroupsTableViewScrollView;
_videoLibraryGroupsTableView = libraryWindow.videoLibraryGroupsTableView;
_loadingOverlayView = libraryWindow.loadingOverlayView;
}
- (void)setupTableViews
......@@ -248,42 +247,6 @@
_videoLibraryGroupSelectionTableViewScrollView.scrollerInsets = scrollerInsets;
}
- (void)setupLoadingOverlayView
{
_loadingOverlayView = [[VLCLoadingOverlayView alloc] init];
self.loadingOverlayView.translatesAutoresizingMaskIntoConstraints = NO;
_loadingOverlayViewConstraints = @[
[NSLayoutConstraint constraintWithItem:self.loadingOverlayView
attribute:NSLayoutAttributeTop
relatedBy:NSLayoutRelationEqual
toItem:self.libraryTargetView
attribute:NSLayoutAttributeTop
multiplier:1
constant:0],
[NSLayoutConstraint constraintWithItem:self.loadingOverlayView
attribute:NSLayoutAttributeRight
relatedBy:NSLayoutRelationEqual
toItem:self.libraryTargetView
attribute:NSLayoutAttributeRight
multiplier:1
constant:0],
[NSLayoutConstraint constraintWithItem:self.loadingOverlayView
attribute:NSLayoutAttributeBottom
relatedBy:NSLayoutRelationEqual
toItem:self.libraryTargetView
attribute:NSLayoutAttributeBottom
multiplier:1
constant:0],
[NSLayoutConstraint constraintWithItem:self.loadingOverlayView
attribute:NSLayoutAttributeLeft
relatedBy:NSLayoutRelationEqual
toItem:self.libraryTargetView
attribute:NSLayoutAttributeLeft
multiplier:1
constant:0]
];
}
#pragma mark - Show the video library view
- (NSArray<NSLayoutConstraint *> *)placeholderImageViewSizeConstraints
......@@ -528,7 +491,7 @@
NSArray * const views = [self.libraryTargetView.subviews arrayByAddingObject:self.loadingOverlayView];
self.libraryTargetView.subviews = views;
[self.libraryTargetView addConstraints:_loadingOverlayViewConstraints];
[self.libraryTargetView addConstraints:self.libraryWindow.loadingOverlayViewConstraints];
[NSAnimationContext runAnimationGroup:^(NSAnimationContext * const context) {
context.duration = 0.5;
......@@ -554,7 +517,7 @@
context.duration = 1.0;
self.loadingOverlayView.animator.alphaValue = 0.0;
} completionHandler:^{
[self.libraryTargetView removeConstraints:_loadingOverlayViewConstraints];
[self.libraryTargetView removeConstraints:self.libraryWindow.loadingOverlayViewConstraints];
NSMutableArray * const views = self.libraryTargetView.subviews.mutableCopy;
[views removeObject:self.loadingOverlayView];
self.libraryTargetView.subviews = views.copy;
......
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