Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
b55bf25d by Claudio Cambra at 2023-02-08T23:04:12+00:00
macosx: Do not update views for VLCLibraryVideoViewController when active video
view is not hidden to prevent video view being overlapped by library
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
5fde6a20 by Claudio Cambra at 2023-02-08T23:04:12+00:00
macosx: Do not update views for VLCLibraryAudioViewController when active video
view is not hidden to prevent video view being overlapped by library
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
da353484 by Claudio Cambra at 2023-02-08T23:04:12+00:00
macosx: Ensure back button in toolbar is available in video view mode to
minimise the video and return to library
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
3 changed files:
- modules/gui/macosx/library/VLCLibraryWindow.m
- modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
- modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
Changes:
=====================================
modules/gui/macosx/library/VLCLibraryWindow.m
=====================================
@@ -861,7 +861,9 @@ static void addShadow(NSImageView *__unsafe_unretained
imageView)
[self.librarySearchField setEnabled:NO];
[self clearLibraryFilterString];
- // Repurpose the back button
+ // Make sure the back button is visible...
+ [self insertToolbarItem:_backwardsToolbarItem inFrontOf:@[]];
+ // And repurpose it to hide the video view
[self.backwardsNavigationButton setEnabled:YES];
if (self.isInNativeFullscreen && [self hasActiveVideo] && [self
fullscreen]) {
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
=====================================
@@ -38,6 +38,8 @@
#import "main/VLCMain.h"
+#import "windows/video/VLCVoutView.h"
+
NSString *VLCLibraryPlaceholderAudioViewIdentifier =
@"VLCLibraryPlaceholderAudioViewIdentifier";
@interface VLCLibraryAudioViewController()
@@ -331,7 +333,8 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier =
@"VLCLibraryPlaceholderAudi
if (_segmentedTitleControl.selectedSegment == VLCLibraryMusicSegment &&
((audioList.count == 0 && ![_libraryTargetView.subviews
containsObject:_emptyLibraryView]) ||
- (audioList.count > 0 && ![_libraryTargetView.subviews
containsObject:_audioLibraryView]))) {
+ (audioList.count > 0 && ![_libraryTargetView.subviews
containsObject:_audioLibraryView])) &&
+ _libraryWindow.videoView.hidden) {
[self updatePresentedView];
}
=====================================
modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
=====================================
@@ -35,6 +35,8 @@
#import "main/VLCMain.h"
+#import "windows/video/VLCVoutView.h"
+
@implementation VLCLibraryVideoViewController
- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow
@@ -181,7 +183,8 @@
if (_segmentedTitleControl.selectedSegment == VLCLibraryVideoSegment &&
((videoList.count == 0 && ![_libraryTargetView.subviews
containsObject:_emptyLibraryView]) ||
- (videoList.count > 0 && ![_libraryTargetView.subviews
containsObject:_videoLibraryView]))) {
+ (videoList.count > 0 && ![_libraryTargetView.subviews
containsObject:_videoLibraryView])) &&
+ _libraryWindow.videoView.hidden) {
[self updatePresentedView];
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/6ad2b5720196e56bc9fd75b3f5fa42c0f2b59811...da353484850ce6c57fb8ddce6345cbdeb8aadb00
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/6ad2b5720196e56bc9fd75b3f5fa42c0f2b59811...da353484850ce6c57fb8ddce6345cbdeb8aadb00
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
