videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

macosx: Move toolbar item handling to VLCLibraryWindowToolbarDelegate 

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
This commit is contained in:
Claudio Cambra 2024-04-19 16:05:47 +08:00 committed by Felix Paul Kühne
parent 9b061f93b3
commit 402ef4c46c
4 changed files with 165 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gui/macosx/library/VLCLibraryWindow.h
View File

@ -143,6 +143,8 @@ extern const NSUserInterfaceItemIdentifier VLCLibraryWindowIdentifier;
- (void)hideControlsBar;
- (void)showControlsBar;
- (void)updateGridVsListViewModeSegmentedControl;
- (void)updateFilterString;
- (void)stopSearchTimer;
- (void)presentLibraryItem:(id<VLCMediaLibraryItemProtocol>)libraryItem;

167
modules/gui/macosx/library/VLCLibraryWindow.m
View File

@ -218,10 +218,10 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
// Hide renderers toolbar item at first. Start discoveries and wait for notifications about
// renderers being added or removed to keep hidden or show depending on outcome
[self hideToolbarItem:_renderersToolbarItem];
[self.toolbarDelegate hideToolbarItem:self.renderersToolbarItem];
[VLCMain.sharedInstance.mainMenu.rendererMenuController startRendererDiscoveries];
[self updatePlayqueueToggleState];
[self.toolbarDelegate updatePlayqueueToggleState];
}
- (void)dealloc
@ -361,145 +361,33 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
[self setViewForSelectedSegment];
}
- (void)hideToolbarItem:(NSToolbarItem *)toolbarItem
{
NSInteger toolbarItemIndex = [[self.toolbar items] indexOfObject:toolbarItem];
if (toolbarItemIndex != NSNotFound) {
[self.toolbar removeItemAtIndex:toolbarItemIndex];
}
}
/*
* Try to insert the toolbar item ahead of a group of possible toolbar items.
* "items" should contain items sorted from the trailing edge of the toolbar to leading edge.
* "toolbarItem" will be inserted as close to the trailing edge as possible.
*
* If you have: | item1 | item2 | item3 | item4 |
* and the "items" parameter is an array containing @[item6, item5, item2, item1]
* then the "toolbarItem" provided to this function will place toolbarItem thus:
* | item1 | item2 | toolbarItem | item3 | item4 |
*/
- (void)insertToolbarItem:(NSToolbarItem *)toolbarItem inFrontOf:(NSArray<NSToolbarItem *> *)items
{
NSParameterAssert(toolbarItem != nil && items != nil && toolbarItem.itemIdentifier.length > 0);
NSInteger toolbarItemIndex = [[self.toolbar items] indexOfObject:toolbarItem];
if (toolbarItemIndex != NSNotFound) {
return;
}
for (NSToolbarItem *item in items) {
NSInteger itemIndex = [[self.toolbar items] indexOfObject:item];
if (itemIndex != NSNotFound) {
[self.toolbar insertItemWithItemIdentifier:toolbarItem.itemIdentifier atIndex:itemIndex + 1];
return;
}
}
[self.toolbar insertItemWithItemIdentifier:toolbarItem.itemIdentifier atIndex:0];
}
- (void)setForwardsBackwardsToolbarItemsVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:_forwardsToolbarItem];
[self hideToolbarItem:_backwardsToolbarItem];
return;
}
[self insertToolbarItem:_backwardsToolbarItem inFrontOf:@[_trackingSeparatorToolbarItem,
_toggleNavSidebarToolbarItem]];
[self insertToolbarItem:_forwardsToolbarItem inFrontOf:@[_backwardsToolbarItem,
_trackingSeparatorToolbarItem,
_toggleNavSidebarToolbarItem]];
}
- (void)setSortOrderToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:_sortOrderToolbarItem];
return;
}
[self insertToolbarItem:_sortOrderToolbarItem
inFrontOf:@[_libraryViewModeToolbarItem,
_forwardsToolbarItem,
_backwardsToolbarItem,
_trackingSeparatorToolbarItem,
_toggleNavSidebarToolbarItem]];
}
- (void)setLibrarySearchToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:_librarySearchToolbarItem];
[self stopSearchTimer];
_librarySearchField.stringValue = @"";
[self updateFilterString];
return;
}
// Display as far to the right as possible, but not in front of the playlist toggle button
NSMutableArray<NSToolbarItem *> *currentToolbarItems = [NSMutableArray arrayWithArray:self.toolbar.items];
if (currentToolbarItems.lastObject == _togglePlaylistToolbarItem) {
[currentToolbarItems removeLastObject];
}
NSArray *reversedCurrentToolbarItems = [[currentToolbarItems reverseObjectEnumerator] allObjects];
[self insertToolbarItem:_librarySearchToolbarItem inFrontOf:reversedCurrentToolbarItems];
}
- (void)setViewModeToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:self.libraryViewModeToolbarItem];
return;
}
[self insertToolbarItem:self.libraryViewModeToolbarItem inFrontOf:@[
self.toggleNavSidebarToolbarItem,
self.trackingSeparatorToolbarItem,
self.forwardsToolbarItem,
self.backwardsToolbarItem
]];
}
- (void)updatePlayqueueToggleState
{
NSView * const playlistView = self.splitViewController.playlistSidebarViewController.view;
_playQueueToggle.state = [self.mainSplitView isSubviewCollapsed:playlistView] ?
NSControlStateValueOff : NSControlStateValueOn;
}
- (void)showHomeLibrary
{
// Only collection view mode
[self setForwardsBackwardsToolbarItemsVisible:NO];
[self setSortOrderToolbarItemVisible:YES];
[self setLibrarySearchToolbarItemVisible:YES];
[self setViewModeToolbarItemVisible:NO];
[self.toolbarDelegate setForwardsBackwardsToolbarItemsVisible:NO];
[self.toolbarDelegate setSortOrderToolbarItemVisible:YES];
[self.toolbarDelegate setLibrarySearchToolbarItemVisible:YES];
[self.toolbarDelegate setViewModeToolbarItemVisible:NO];
[_libraryHomeViewController presentHomeView];
}
- (void)showVideoLibrary
{
[self setForwardsBackwardsToolbarItemsVisible:NO];
[self setSortOrderToolbarItemVisible:YES];
[self setLibrarySearchToolbarItemVisible:YES];
[self setViewModeToolbarItemVisible:YES];
[self.toolbarDelegate setForwardsBackwardsToolbarItemsVisible:NO];
[self.toolbarDelegate setSortOrderToolbarItemVisible:YES];
[self.toolbarDelegate setLibrarySearchToolbarItemVisible:YES];
[self.toolbarDelegate setViewModeToolbarItemVisible:YES];
[_libraryVideoViewController presentVideoView];
}
- (void)showAudioLibrary
{
[self setForwardsBackwardsToolbarItemsVisible:NO];
[self setSortOrderToolbarItemVisible:YES];
[self setLibrarySearchToolbarItemVisible:YES];
[self setViewModeToolbarItemVisible:YES];
[self.toolbarDelegate setForwardsBackwardsToolbarItemsVisible:NO];
[self.toolbarDelegate setSortOrderToolbarItemVisible:YES];
[self.toolbarDelegate setLibrarySearchToolbarItemVisible:YES];
[self.toolbarDelegate setViewModeToolbarItemVisible:YES];
self.libraryAudioViewController.currentSegmentType = self.librarySegmentType;
}
@ -507,10 +395,10 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
- (void)showMediaSourceLibrary
{
[self.navigationStack clear];
[self setForwardsBackwardsToolbarItemsVisible:YES];
[self setSortOrderToolbarItemVisible:NO];
[self setLibrarySearchToolbarItemVisible:NO];
[self setViewModeToolbarItemVisible:YES];
[self.toolbarDelegate setForwardsBackwardsToolbarItemsVisible:YES];
[self.toolbarDelegate setSortOrderToolbarItemVisible:NO];
[self.toolbarDelegate setLibrarySearchToolbarItemVisible:NO];
[self.toolbarDelegate setViewModeToolbarItemVisible:YES];
const VLCLibrarySegmentType segmentType = self.librarySegmentType;
if (segmentType == VLCLibraryBrowseSegment) {
@ -775,7 +663,9 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
[self clearLibraryFilterString];
// Make sure the back button is visible...
[self insertToolbarItem:_backwardsToolbarItem inFrontOf:@[_trackingSeparatorToolbarItem, _toggleNavSidebarToolbarItem]];
[self.toolbarDelegate insertToolbarItem:self.backwardsToolbarItem
inFrontOf:@[self.trackingSeparatorToolbarItem,
self.toggleNavSidebarToolbarItem]];
// And repurpose it to hide the video view
[self.backwardsNavigationButton setEnabled:YES];
@ -862,14 +752,19 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)
- (void)renderersChanged:(NSNotification *)notification
{
const NSUInteger rendererCount = VLCMain.sharedInstance.mainMenu.rendererMenuController.rendererItems.count;
const BOOL rendererToolbarItemVisible = [self.toolbar.items containsObject:_renderersToolbarItem];
const NSUInteger rendererCount =
VLCMain.sharedInstance.mainMenu.rendererMenuController.rendererItems.count;
const BOOL rendererToolbarItemVisible =
[self.toolbar.items containsObject:self.renderersToolbarItem];
if (rendererCount > 0 && !rendererToolbarItemVisible) {
[self insertToolbarItem:_renderersToolbarItem
inFrontOf:@[_sortOrderToolbarItem, _libraryViewModeToolbarItem, _forwardsToolbarItem, _backwardsToolbarItem]];
[self.toolbarDelegate insertToolbarItem:self.renderersToolbarItem
inFrontOf:@[self.sortOrderToolbarItem,
self.libraryViewModeToolbarItem,
self.forwardsToolbarItem,
self.backwardsToolbarItem]];
} else if (rendererCount == 0 && rendererToolbarItemVisible) {
[self hideToolbarItem:_renderersToolbarItem];
[self.toolbarDelegate hideToolbarItem:self.renderersToolbarItem];
}
}

9
modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.h
View File

@ -34,6 +34,15 @@ extern NSString * const VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier;
- (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
- (void)insertToolbarItem:(NSToolbarItem *)toolbarItem inFrontOf:(NSArray<NSToolbarItem *> *)items;
- (void)hideToolbarItem:(NSToolbarItem *)toolbarItem;
- (void)setForwardsBackwardsToolbarItemsVisible:(BOOL)visible;
- (void)setSortOrderToolbarItemVisible:(BOOL)visible;
- (void)setSortOrderToolbarItemVisible:(BOOL)visible;
- (void)setLibrarySearchToolbarItemVisible:(BOOL)visible;
- (void)setViewModeToolbarItemVisible:(BOOL)visible;
- (void)updatePlayqueueToggleState;
@end
NS_ASSUME_NONNULL_END

124
modules/gui/macosx/library/VLCLibraryWindowToolbarDelegate.m
View File

@ -23,6 +23,7 @@
#import "VLCLibraryWindowToolbarDelegate.h"
#import "library/VLCLibraryWindow.h"
#import "library/VLCLibraryWindowPlaylistSidebarViewController.h"
#import "library/VLCLibraryWindowSplitViewController.h"
NSString * const VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier = @"VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier";
@ -44,11 +45,132 @@ NSString * const VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier = @"VLCL
{
if ([itemIdentifier isEqualToString:VLCLibraryWindowTrackingSeparatorToolbarItemIdentifier]) {
if (@available(macOS 11.0, *)) {
return [NSTrackingSeparatorToolbarItem trackingSeparatorToolbarItemWithIdentifier:itemIdentifier splitView:_libraryWindow.mainSplitView dividerIndex:VLCLibraryWindowNavigationSidebarSplitViewDividerIndex];
return [NSTrackingSeparatorToolbarItem trackingSeparatorToolbarItemWithIdentifier:itemIdentifier splitView:self.libraryWindow.mainSplitView dividerIndex:VLCLibraryWindowNavigationSidebarSplitViewDividerIndex];
}
}
return nil;
}
- (void)hideToolbarItem:(NSToolbarItem *)toolbarItem
{
const NSInteger toolbarItemIndex = [self.libraryWindow.toolbar.items indexOfObject:toolbarItem];
if (toolbarItemIndex != NSNotFound) {
[self.libraryWindow.toolbar removeItemAtIndex:toolbarItemIndex];
}
}
/*
* Try to insert the toolbar item ahead of a group of possible toolbar items.
* "items" should contain items sorted from the trailing edge of the toolbar to leading edge.
* "toolbarItem" will be inserted as close to the trailing edge as possible.
*
* If you have: | item1 | item2 | item3 | item4 |
* and the "items" parameter is an array containing @[item6, item5, item2, item1]
* then the "toolbarItem" provided to this function will place toolbarItem thus:
* | item1 | item2 | toolbarItem | item3 | item4 |
*/
- (void)insertToolbarItem:(NSToolbarItem *)toolbarItem inFrontOf:(NSArray<NSToolbarItem *> *)items
{
NSParameterAssert(toolbarItem != nil && items != nil && toolbarItem.itemIdentifier.length > 0);
const NSInteger toolbarItemIndex = [self.libraryWindow.toolbar.items indexOfObject:toolbarItem];
if (toolbarItemIndex != NSNotFound) {
return;
}
for (NSToolbarItem * const item in items) {
const NSInteger itemIndex = [self.libraryWindow.toolbar.items indexOfObject:item];
if (itemIndex != NSNotFound) {
[self.libraryWindow.toolbar insertItemWithItemIdentifier:toolbarItem.itemIdentifier
atIndex:itemIndex + 1];
return;
}
}
[self.libraryWindow.toolbar insertItemWithItemIdentifier:toolbarItem.itemIdentifier atIndex:0];
}
- (void)setForwardsBackwardsToolbarItemsVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:self.libraryWindow.forwardsToolbarItem];
[self hideToolbarItem:self.libraryWindow.backwardsToolbarItem];
return;
}
[self insertToolbarItem:self.libraryWindow.backwardsToolbarItem
inFrontOf:@[
self.libraryWindow.trackingSeparatorToolbarItem,
self.libraryWindow.toggleNavSidebarToolbarItem]];
[self insertToolbarItem:self.libraryWindow.forwardsToolbarItem
inFrontOf:@[self.libraryWindow.backwardsToolbarItem,
self.libraryWindow.trackingSeparatorToolbarItem,
self.libraryWindow.toggleNavSidebarToolbarItem]];
}
- (void)setSortOrderToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:self.libraryWindow.sortOrderToolbarItem];
return;
}
[self insertToolbarItem:self.libraryWindow.sortOrderToolbarItem
inFrontOf:@[self.libraryWindow.libraryViewModeToolbarItem,
self.libraryWindow.forwardsToolbarItem,
self.libraryWindow.backwardsToolbarItem,
self.libraryWindow.trackingSeparatorToolbarItem,
self.libraryWindow.toggleNavSidebarToolbarItem]];
}
- (void)setLibrarySearchToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:self.libraryWindow.librarySearchToolbarItem];
[self.libraryWindow stopSearchTimer];
self.libraryWindow.librarySearchField.stringValue = @"";
[self.libraryWindow updateFilterString];
return;
}
// Display as far to the right as possible, but not in front of the playlist toggle button
NSMutableArray<NSToolbarItem *> * const currentToolbarItems =
[NSMutableArray arrayWithArray:self.libraryWindow.toolbar.items];
if (currentToolbarItems.lastObject == self.libraryWindow.togglePlaylistToolbarItem) {
[currentToolbarItems removeLastObject];
}
NSArray * const reversedCurrentToolbarItems =
currentToolbarItems.reverseObjectEnumerator.allObjects;
[self insertToolbarItem:self.libraryWindow.librarySearchToolbarItem
inFrontOf:reversedCurrentToolbarItems];
}
- (void)setViewModeToolbarItemVisible:(BOOL)visible
{
if (!visible) {
[self hideToolbarItem:self.libraryWindow.libraryViewModeToolbarItem];
return;
}
[self insertToolbarItem:self.libraryWindow.libraryViewModeToolbarItem
inFrontOf:@[self.libraryWindow.toggleNavSidebarToolbarItem,
self.libraryWindow.trackingSeparatorToolbarItem,
self.libraryWindow.forwardsToolbarItem,
self.libraryWindow.backwardsToolbarItem]];
}
- (void)updatePlayqueueToggleState
{
NSView * const playlistView =
self.libraryWindow.splitViewController.playlistSidebarViewController.view;
self.libraryWindow.playQueueToggle.state =
[self.libraryWindow.mainSplitView isSubviewCollapsed:playlistView] ?
NSControlStateValueOff : NSControlStateValueOn;
}
@end