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

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


Signed-off-by: default avatarClaudio Cambra <developer@claudiocambra.com>
parent 39873025
No related branches found
No related tags found
1 merge request!6136macosx: Unify handling of various view's presentation
......@@ -24,7 +24,6 @@
#import "library/VLCLibraryAbstractSegmentViewController.h"
@class VLCLoadingOverlayView;
@class VLCLibraryWindow;
@class VLCLibraryVideoDataSource;
@class VLCLibraryShowsDataSource;
......@@ -45,7 +44,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly, weak) NSTableView *videoLibraryGroupSelectionTableView;
@property (readonly, weak) NSScrollView *videoLibraryGroupsTableViewScrollView;
@property (readonly, weak) NSTableView *videoLibraryGroupsTableView;
@property (readonly, weak) VLCLoadingOverlayView *loadingOverlayView;
@property (readonly, nullable) VLCLibraryVideoDataSource *libraryVideoDataSource;
@property (readonly, nullable) VLCLibraryShowsDataSource *libraryShowsDataSource;
......
......@@ -50,7 +50,6 @@
#import "main/VLCMain.h"
#import "views/VLCLoadingOverlayView.h"
#import "views/VLCNoResultsLabel.h"
#import "windows/video/VLCVoutView.h"
......@@ -134,7 +133,6 @@
_videoLibraryGroupSelectionTableView = libraryWindow.videoLibraryGroupSelectionTableView;
_videoLibraryGroupsTableViewScrollView = libraryWindow.videoLibraryGroupsTableViewScrollView;
_videoLibraryGroupsTableView = libraryWindow.videoLibraryGroupsTableView;
_loadingOverlayView = libraryWindow.loadingOverlayView;
}
- (void)setupTableViews
......@@ -344,8 +342,8 @@
}
self.emptyLibraryView.translatesAutoresizingMaskIntoConstraints = NO;
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.emptyLibraryView, self.loadingOverlayView];
if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.emptyLibraryView, self.libraryWindow.loadingOverlayView];
} else {
self.libraryTargetView.subviews = @[self.emptyLibraryView];
}
......@@ -365,8 +363,8 @@
_noResultsLabel.translatesAutoresizingMaskIntoConstraints = NO;
}
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) {
self.libraryTargetView.subviews = @[_noResultsLabel, self.loadingOverlayView];
if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[_noResultsLabel, self.libraryWindow.loadingOverlayView];
} else {
self.libraryTargetView.subviews = @[_noResultsLabel];
}
......
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