[vlc-commits] [Git][videolan/vlc][master] macosx: Make VLCLibraryHeaderView component segment agnostic

Felix Paul Kühne (@fkuehne) gitlab at videolan.org
Sun May 10 07:26:40 UTC 2026



Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
227773cf by Claudio Cambra at 2026-05-10T09:00:59+02:00
macosx: Make VLCLibraryHeaderView component segment agnostic

Signed-off-by: Claudio Cambra <developer at claudiocambra.com>

- - - - -


17 changed files:

- modules/gui/macosx/Makefile.am
- modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h → modules/gui/macosx/library/VLCLibraryHeaderCell.h
- modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.m → modules/gui/macosx/library/VLCLibraryHeaderCell.m
- modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.h → modules/gui/macosx/library/VLCLibraryHeaderView.h
- modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.m → modules/gui/macosx/library/VLCLibraryHeaderView.m
- modules/gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.h
- modules/gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.m
- modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupDataSource.m
- modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h
- modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
- modules/gui/macosx/library/favorites-library/VLCLibraryFavoritesViewController.h
- modules/gui/macosx/library/favorites-library/VLCLibraryFavoritesViewController.m
- modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.h
- modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.m
- modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.h
- modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.m
- modules/gui/macosx/library/video-library/VLCLibraryVideoTableViewDelegate.m


Changes:

=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -283,10 +283,10 @@ libmacosx_plugin_la_SOURCES = \
 	gui/macosx/library/audio-library/VLCLibraryAudioDataSource.m \
 	gui/macosx/library/audio-library/VLCLibraryAudioGroupDataSource.h \
 	gui/macosx/library/audio-library/VLCLibraryAudioGroupDataSource.m \
-	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h \
-	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.m \
-	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.h \
-	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.m \
+	gui/macosx/library/VLCLibraryHeaderCell.h \
+	gui/macosx/library/VLCLibraryHeaderCell.m \
+	gui/macosx/library/VLCLibraryHeaderView.h \
+	gui/macosx/library/VLCLibraryHeaderView.m \
 	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableViewDelegate.h \
 	gui/macosx/library/audio-library/VLCLibraryAudioGroupTableViewDelegate.m \
 	gui/macosx/library/audio-library/VLCLibraryAudioTableViewDelegate.h \


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h → modules/gui/macosx/library/VLCLibraryHeaderCell.h
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCLibraryAudioGroupTableHeaderCell.h: MacOS X interface module
+ * VLCLibraryHeaderCell.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2025 VLC authors and VideoLAN
  *
@@ -24,7 +24,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
- at interface VLCLibraryAudioGroupTableHeaderCell : NSTableHeaderCell
+ at interface VLCLibraryHeaderCell : NSTableHeaderCell
 
 @end
 


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderCell.m → modules/gui/macosx/library/VLCLibraryHeaderCell.m
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCLibraryAudioGroupTableHeaderCell.m: MacOS X interface module
+ * VLCLibraryHeaderCell.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2025 VLC authors and VideoLAN
  *
@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "VLCLibraryAudioGroupTableHeaderCell.h"
+#import "VLCLibraryHeaderCell.h"
 
- at implementation VLCLibraryAudioGroupTableHeaderCell
+ at implementation VLCLibraryHeaderCell
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
 {


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.h → modules/gui/macosx/library/VLCLibraryHeaderView.h
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCLibraryAudioGroupTableHeaderView.h: MacOS X interface module
+ * VLCLibraryHeaderView.h: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2025 VLC authors and VideoLAN
  *
@@ -26,10 +26,10 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern const CGFloat VLCLibraryAudioGroupTableHeaderViewHeight;
-extern NSString * const VLCLibraryAudioGroupTableHeaderViewIdentifier;
+extern const CGFloat VLCLibraryHeaderViewHeight;
+extern NSString * const VLCLibraryHeaderViewIdentifier;
 
- at interface VLCLibraryAudioGroupTableHeaderView : NSTableHeaderView
+ at interface VLCLibraryHeaderView : NSTableHeaderView
 
 @property (nullable, nonatomic) VLCLibraryRepresentedItem *representedItem;
 @property (readwrite, nonatomic) BOOL internalPaddingAddedForContentView;


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupTableHeaderView.m → modules/gui/macosx/library/VLCLibraryHeaderView.m
=====================================
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * VLCLibraryAudioGroupTableHeaderView.m: MacOS X interface module
+ * VLCLibraryHeaderView.m: MacOS X interface module
  *****************************************************************************
  * Copyright (C) 2025 VLC authors and VideoLAN
  *
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "VLCLibraryAudioGroupTableHeaderView.h"
+#import "VLCLibraryHeaderView.h"
 
 #import "library/VLCLibraryRepresentedItem.h"
 #import "library/VLCLibraryUIUnits.h"
@@ -30,10 +30,10 @@
 #import "extensions/NSString+Helpers.h"
 #import "extensions/NSView+VLCAdditions.h"
 
-const CGFloat VLCLibraryAudioGroupTableHeaderViewHeight = 66.f;
-NSString * const VLCLibraryAudioGroupTableHeaderViewIdentifier = @"VLCLibraryAudioGroupTableHeaderView";
+const CGFloat VLCLibraryHeaderViewHeight = 66.f;
+NSString * const VLCLibraryHeaderViewIdentifier = @"VLCLibraryHeaderView";
 
- at interface VLCLibraryAudioGroupTableHeaderView ()
+ at interface VLCLibraryHeaderView ()
 
 @property NSView *backgroundView;
 @property NSStackView *rootStackView;
@@ -49,7 +49,7 @@ NSString * const VLCLibraryAudioGroupTableHeaderViewIdentifier = @"VLCLibraryAud
 
 @end
 
- at implementation VLCLibraryAudioGroupTableHeaderView
+ at implementation VLCLibraryHeaderView
 
 + (CGFloat)internalPaddingHeight
 {
@@ -65,13 +65,13 @@ NSString * const VLCLibraryAudioGroupTableHeaderViewIdentifier = @"VLCLibraryAud
 
 + (CGFloat)paddedHeaderViewHeight
 {
-    return VLCLibraryAudioGroupTableHeaderViewHeight + self.internalPaddingHeight;
+    return VLCLibraryHeaderViewHeight + self.internalPaddingHeight;
 }
 
 + (instancetype)paddedHeaderView
 {
     const NSRect headerFrame = NSMakeRect(0.f, 0.f, 0.f, self.paddedHeaderViewHeight);
-    VLCLibraryAudioGroupTableHeaderView * const headerView =
+    VLCLibraryHeaderView * const headerView =
         [[self alloc] initWithFrame:headerFrame withInternalPaddingAddedForContentView:YES];
     headerView.autoresizingMask = NSViewWidthSizable;
     return headerView;


=====================================
modules/gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.h
=====================================
@@ -25,13 +25,13 @@
 #import "library/VLCLibraryGroupHeaderDelegate.h"
 #import "library/VLCLibraryTableViewDelegate.h"
 
- at class VLCLibraryAudioGroupTableHeaderView;
+ at class VLCLibraryHeaderView;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface VLCLibraryMasterDetailViewTableViewDelegate : VLCLibraryTableViewDelegate<VLCLibraryGroupHeaderDelegate>
 
- at property (readwrite, weak) VLCLibraryAudioGroupTableHeaderView *detailTableHeaderView;
+ at property (readwrite, weak) VLCLibraryHeaderView *detailTableHeaderView;
 
 @end
 


=====================================
modules/gui/macosx/library/VLCLibraryMasterDetailViewTableViewDelegate.m
=====================================
@@ -25,7 +25,7 @@
 #import "library/VLCLibraryMasterDetailViewTableViewDataSource.h"
 #import "library/VLCLibraryRepresentedItem.h"
 
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderView.h"
 
 @implementation VLCLibraryMasterDetailViewTableViewDelegate
 


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioGroupDataSource.m
=====================================
@@ -36,7 +36,7 @@
 #import "library/VLCLibraryWindow.h"
 
 #import "library/audio-library/VLCLibraryAlbumTableCellView.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderView.h"
 
 #import "views/VLCSubScrollView.h"
 
@@ -56,9 +56,9 @@
 
 + (void)setupCollectionView:(NSCollectionView *)collectionView
 {
-    [collectionView registerClass:VLCLibraryAudioGroupTableHeaderView.class
+    [collectionView registerClass:VLCLibraryHeaderView.class
        forSupplementaryViewOfKind:NSCollectionElementKindSectionHeader
-                   withIdentifier:VLCLibraryAudioGroupTableHeaderViewIdentifier];
+                   withIdentifier:VLCLibraryHeaderViewIdentifier];
 }
 
 - (instancetype)init
@@ -423,7 +423,7 @@ viewForSupplementaryElementOfKind:(NSCollectionViewSupplementaryElementKind)kind
         return albumSupplementaryDetailView;
 
     } else if ([kind isEqualToString:NSCollectionElementKindSectionHeader]) {
-        VLCLibraryAudioGroupTableHeaderView * const headerView = [collectionView makeSupplementaryViewOfKind:kind withIdentifier:VLCLibraryAudioGroupTableHeaderViewIdentifier forIndexPath:indexPath];
+        VLCLibraryHeaderView * const headerView = [collectionView makeSupplementaryViewOfKind:kind withIdentifier:VLCLibraryHeaderViewIdentifier forIndexPath:indexPath];
 
         VLCLibraryRepresentedItem * const representedItem = [[VLCLibraryRepresentedItem alloc] initWithItem:_representedAudioGroup parentType:_currentParentType];
         headerView.representedItem = representedItem;


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h
=====================================
@@ -29,7 +29,7 @@
 
 @class VLCLibraryAudioDataSource;
 @class VLCLibraryAudioGroupDataSource;
- at class VLCLibraryAudioGroupTableHeaderView;
+ at class VLCLibraryHeaderView;
 @class VLCLibraryCollectionView;
 @class VLCLibraryWindow;
 
@@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, weak) NSSplitView *audioLibrarySplitView;
 @property (readonly, weak) NSScrollView *audioCollectionSelectionTableViewScrollView;
 @property (readonly, weak) NSTableView *audioCollectionSelectionTableView;
- at property (readonly, strong) VLCLibraryAudioGroupTableHeaderView *audioCollectionHeaderView;
+ at property (readonly, strong) VLCLibraryHeaderView *audioCollectionHeaderView;
 @property (readonly, weak) NSScrollView *audioGroupSelectionTableViewScrollView;
 @property (readonly, weak) NSTableView *audioGroupSelectionTableView;
 @property (readonly, weak) NSScrollView *audioSongTableViewScrollView;


=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
=====================================
@@ -41,9 +41,9 @@
 #import "library/audio-library/VLCLibraryAlbumTableCellView.h"
 #import "library/audio-library/VLCLibraryAudioDataSource.h"
 #import "library/audio-library/VLCLibraryAudioGroupDataSource.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderView.h"
 #import "library/audio-library/VLCLibraryAudioGroupTableViewDelegate.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h"
+#import "library/VLCLibraryHeaderCell.h"
 #import "library/audio-library/VLCLibraryAudioTableViewDelegate.h"
 
 #import "library/playlist-library/VLCLibraryPlaylistViewController.h"
@@ -187,9 +187,9 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
     _audioCollectionSelectionTableView.dataSource = _audioDataSource;
     _audioCollectionSelectionTableView.delegate = _audioLibraryTableViewDelegate;
 
-    _audioCollectionHeaderView = [VLCLibraryAudioGroupTableHeaderView paddedHeaderView];
+    _audioCollectionHeaderView = [VLCLibraryHeaderView paddedHeaderView];
     _audioGroupSelectionTableView.headerView = self.audioCollectionHeaderView;
-    _audioGroupSelectionTableView.tableColumns.firstObject.headerCell = [VLCLibraryAudioGroupTableHeaderCell new];
+    _audioGroupSelectionTableView.tableColumns.firstObject.headerCell = [VLCLibraryHeaderCell new];
 
     _audioGroupSelectionTableView.dataSource = _audioGroupDataSource;
     _audioGroupSelectionTableView.delegate = _audioGroupLibraryTableViewDelegate;
@@ -222,7 +222,7 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
         VLCLibraryCollectionViewFlowLayout.standardLayout;
     _audioLibraryGridModeSplitViewListSelectionCollectionView.collectionViewLayout = audioLibraryGridModeListSelectionCollectionViewLayout;
     audioLibraryGridModeListSelectionCollectionViewLayout.headerReferenceSize =
-        NSMakeSize(self.audioCollectionViewScrollView.documentView.frame.size.width, VLCLibraryAudioGroupTableHeaderViewHeight);
+        NSMakeSize(self.audioCollectionViewScrollView.documentView.frame.size.width, VLCLibraryHeaderViewHeight);
 
     if (@available(macOS 10.12, *)) {
         audioLibraryGridModeListSelectionCollectionViewLayout.sectionHeadersPinToVisibleBounds = YES;


=====================================
modules/gui/macosx/library/favorites-library/VLCLibraryFavoritesViewController.h
=====================================
@@ -29,7 +29,7 @@
 @class VLCLibraryCollectionView;
 @class VLCLibraryWindow;
 @class VLCLibraryFavoritesDataSource;
- at class VLCLibraryAudioGroupTableHeaderView;
+ at class VLCLibraryHeaderView;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly, strong) NSTableView *favoritesLibraryGroupsTableView;
 
 @property (readwrite, strong) VLCLibraryFavoritesDataSource *libraryFavoritesDataSource;
- at property (readwrite, strong) VLCLibraryAudioGroupTableHeaderView *favoritesHeaderView;
+ at property (readwrite, strong) VLCLibraryHeaderView *favoritesHeaderView;
 
 - (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
 - (void)presentFavoritesView;


=====================================
modules/gui/macosx/library/favorites-library/VLCLibraryFavoritesViewController.m
=====================================
@@ -46,8 +46,8 @@
 #import "library/favorites-library/VLCLibraryFavoritesTableViewDelegate.h"
 #import "library/audio-library/VLCLibraryAlbumTableCellView.h"
 #import "library/audio-library/VLCLibraryCollectionViewAudioGroupSupplementaryDetailView.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h"
+#import "library/VLCLibraryHeaderView.h"
+#import "library/VLCLibraryHeaderCell.h"
 #import "main/VLCMain.h"
 
 @interface VLCLibraryFavoritesViewController ()
@@ -107,7 +107,7 @@
 {
     self.favoritesLibrarySplitView.delegate = _splitViewDelegate;
 
-    _favoritesHeaderView = [VLCLibraryAudioGroupTableHeaderView paddedHeaderView];
+    _favoritesHeaderView = [VLCLibraryHeaderView paddedHeaderView];
 
     _favoritesLibraryTableViewDelegate.detailTableHeaderView = self.favoritesHeaderView;
     self.favoritesLibraryGroupSelectionTableView.headerView = self.favoritesHeaderView;
@@ -115,7 +115,7 @@
     NSTableColumn * const groupsColumn = [[NSTableColumn alloc] initWithIdentifier:@"groups"];
     NSTableColumn * const selectedGroupColumn = [[NSTableColumn alloc] initWithIdentifier:@"selectedGroup"];
     
-    selectedGroupColumn.headerCell = [VLCLibraryAudioGroupTableHeaderCell new];
+    selectedGroupColumn.headerCell = [VLCLibraryHeaderCell new];
 
     [self.favoritesLibraryGroupsTableView addTableColumn:groupsColumn];
     [self.favoritesLibraryGroupSelectionTableView addTableColumn:selectedGroupColumn];


=====================================
modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.h
=====================================
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class VLCLibraryTableView;
 @class VLCLibraryWindow;
 @class VLCLibraryTwoPaneSplitViewDelegate;
- at class VLCLibraryAudioGroupTableHeaderView;
+ at class VLCLibraryHeaderView;
 
 @interface VLCLibraryGroupsViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<NSSplitViewDelegate, VLCLibraryItemPresentingCapable>
 
@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly) VLCLibraryTwoPaneSplitViewDelegate *splitViewDelegate;
 
 @property (readonly) VLCLibraryGroupsDataSource *dataSource;
- at property (readonly) VLCLibraryAudioGroupTableHeaderView *selectedGroupTableHeaderView;
+ at property (readonly) VLCLibraryHeaderView *selectedGroupTableHeaderView;
 
 - (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
 


=====================================
modules/gui/macosx/library/groups-library/VLCLibraryGroupsViewController.m
=====================================
@@ -41,8 +41,8 @@
 #import "library/VLCLibraryWindow.h"
 #import "library/VLCLibraryWindowPersistentPreferences.h"
 
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderCell.h"
+#import "library/VLCLibraryHeaderView.h"
 
 #import "library/groups-library/VLCLibraryGroupsDataSource.h"
 
@@ -191,7 +191,7 @@
     [self.selectedGroupTableView registerNib:tableCellViewNib
                                forIdentifier:@"VLCLibraryTableViewCellIdentifier"];
 
-    _selectedGroupTableHeaderView = [VLCLibraryAudioGroupTableHeaderView paddedHeaderView];
+    _selectedGroupTableHeaderView = [VLCLibraryHeaderView paddedHeaderView];
 
     self.tableViewDelegate.detailTableHeaderView = self.selectedGroupTableHeaderView;
 
@@ -200,7 +200,7 @@
     self.groupsTableView.allowsMultipleSelection = YES;
     self.selectedGroupTableView.headerView = self.selectedGroupTableHeaderView;
 
-    selectedGroupColumn.headerCell = [VLCLibraryAudioGroupTableHeaderCell new];
+    selectedGroupColumn.headerCell = [VLCLibraryHeaderCell new];
 
     self.groupsTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
     self.selectedGroupTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;


=====================================
modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.h
=====================================
@@ -35,7 +35,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class VLCLibraryTableView;
 @class VLCLibraryTwoPaneSplitViewDelegate;
 @class VLCLibraryWindow;
- at class VLCLibraryAudioGroupTableHeaderView;
+ at class VLCLibraryHeaderView;
 
 @interface VLCLibraryPlaylistViewController : VLCLibraryAbstractMediaLibrarySegmentViewController<NSSplitViewDelegate>
 
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (readonly) VLCLibraryCollectionViewDelegate *collectionViewDelegate;
 @property (readonly) VLCLibraryMasterDetailViewTableViewDelegate *tableViewDelegate;
 @property (readonly) VLCLibraryTwoPaneSplitViewDelegate *splitViewDelegate;
- at property (readonly) VLCLibraryAudioGroupTableHeaderView *detailTableHeaderView;
+ at property (readonly) VLCLibraryHeaderView *detailTableHeaderView;
 
 - (instancetype)initWithLibraryWindow:(VLCLibraryWindow *)libraryWindow;
 


=====================================
modules/gui/macosx/library/playlist-library/VLCLibraryPlaylistViewController.m
=====================================
@@ -42,8 +42,8 @@
 #import "library/audio-library/VLCLibraryAudioViewController.h"
 
 #import "library/playlist-library/VLCLibraryPlaylistDataSource.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderCell.h"
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderCell.h"
+#import "library/VLCLibraryHeaderView.h"
 
 #import "library/video-library/VLCLibraryVideoViewController.h"
 
@@ -188,7 +188,7 @@
     [self.detailTableView registerNib:tableCellViewNib
                         forIdentifier:@"VLCLibraryTableViewCellIdentifier"];
 
-    _detailTableHeaderView = [VLCLibraryAudioGroupTableHeaderView paddedHeaderView];
+    _detailTableHeaderView = [VLCLibraryHeaderView paddedHeaderView];
 
     self.tableViewDelegate.detailTableHeaderView = self.detailTableHeaderView;
 
@@ -196,7 +196,7 @@
     self.masterTableView.allowsEmptySelection = NO;
     self.detailTableView.headerView = self.detailTableHeaderView;
 
-    detailColumn.headerCell = [VLCLibraryAudioGroupTableHeaderCell new];
+    detailColumn.headerCell = [VLCLibraryHeaderCell new];
 
     self.masterTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
     self.detailTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;


=====================================
modules/gui/macosx/library/video-library/VLCLibraryVideoTableViewDelegate.m
=====================================
@@ -29,7 +29,7 @@
 #import "library/VLCLibraryTableView.h"
 #import "library/VLCLibraryUIUnits.h"
 
-#import "library/audio-library/VLCLibraryAudioGroupTableHeaderView.h"
+#import "library/VLCLibraryHeaderView.h"
 
 @interface VLCLibraryVideoHeaderRowView : NSTableRowView
 @end
@@ -59,12 +59,12 @@
         (NSObject<VLCLibrarySectionedTableViewDataSource> *)tableView.dataSource;
 
     if ([sectionedDataSource isHeaderRow:row]) {
-        VLCLibraryAudioGroupTableHeaderView *headerView =
-            (VLCLibraryAudioGroupTableHeaderView *)[tableView makeViewWithIdentifier:VLCLibraryAudioGroupTableHeaderViewIdentifier
+        VLCLibraryHeaderView *headerView =
+            (VLCLibraryHeaderView *)[tableView makeViewWithIdentifier:VLCLibraryHeaderViewIdentifier
                                                                                owner:self];
         if (headerView == nil) {
-            headerView = [[VLCLibraryAudioGroupTableHeaderView alloc] initWithFrame:NSZeroRect];
-            headerView.identifier = VLCLibraryAudioGroupTableHeaderViewIdentifier;
+            headerView = [[VLCLibraryHeaderView alloc] initWithFrame:NSZeroRect];
+            headerView.identifier = VLCLibraryHeaderViewIdentifier;
         }
 
         NSString * const title = [sectionedDataSource titleForRow:row];
@@ -87,7 +87,7 @@
         NSObject<VLCLibrarySectionedTableViewDataSource> * const sectionedDataSource =
             (NSObject<VLCLibrarySectionedTableViewDataSource> *)tableView.dataSource;
         if ([sectionedDataSource isHeaderRow:row]) {
-            return VLCLibraryAudioGroupTableHeaderViewHeight;
+            return VLCLibraryHeaderViewHeight;
         }
     }
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/227773cf199bbaa9cc6c8e2995b7ed2828098abc

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/227773cf199bbaa9cc6c8e2995b7ed2828098abc
You're receiving this email because of your account on code.videolan.org.




More information about the vlc-commits mailing list