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

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


Signed-off-by: default avatarClaudio Cambra <developer@claudiocambra.com>
parent e6916053
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 VLCLibraryHomeViewStackViewController;
......@@ -39,7 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly, weak) NSView *homeLibraryView;
@property (readonly, weak) NSScrollView *homeLibraryStackViewScrollView;
@property (readonly, weak) NSStackView *homeLibraryStackView;
@property (readonly, weak) VLCLoadingOverlayView *loadingOverlayView;
@property (readonly) VLCLibraryHomeViewStackViewController *stackViewController;
......
......@@ -43,8 +43,6 @@
#import "main/VLCMain.h"
#import "views/VLCLoadingOverlayView.h"
#import "windows/video/VLCMainVideoViewController.h"
@interface VLCLibraryHomeViewController ()
......@@ -106,7 +104,6 @@
_homeLibraryView = libraryWindow.homeLibraryView;
_homeLibraryStackViewScrollView = libraryWindow.homeLibraryStackViewScrollView;
_homeLibraryStackView = libraryWindow.homeLibraryStackView;
_loadingOverlayView = libraryWindow.loadingOverlayView;
}
- (void)setupGridViewController
......@@ -180,8 +177,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];
}
......@@ -197,8 +194,8 @@
- (void)presentHomeLibraryView
{
self.homeLibraryView.translatesAutoresizingMaskIntoConstraints = NO;
if ([self.libraryTargetView.subviews containsObject:self.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.homeLibraryView, self.loadingOverlayView];
if ([self.libraryTargetView.subviews containsObject:self.libraryWindow.loadingOverlayView]) {
self.libraryTargetView.subviews = @[self.homeLibraryView, self.libraryWindow.loadingOverlayView];
} else {
self.libraryTargetView.subviews = @[self.homeLibraryView];
}
......
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