macosx: Use dot notation to access class properties in VLCLibraryUIUnits

Signed-off-by: Claudio Cambra <developer@claudiocambra.com>
3 years ago · eda76c2b16
16 changed files with 86 additions and 86 deletions
--- a/modules/gui/macosx/library/VLCLibraryCollectionViewFlowLayout.m
+++ b/modules/gui/macosx/library/VLCLibraryCollectionViewFlowLayout.m
@ -84,8 +84,8 @@ static CVReturn detailViewAnimationCallback(CVDisplayLinkRef displayLink,
 {
    self = [super init];
    if (self) {
-        _defaultHeightAnimationSteps = [NSArray arrayWithArray:[self generateAnimationStepsForExpandedViewHeight:[VLCLibraryUIUnits mediumDetailSupplementaryViewCollectionViewHeight]]];
-        _largeHeightAnimationSteps = [NSArray arrayWithArray:[self generateAnimationStepsForExpandedViewHeight:[VLCLibraryUIUnits largeDetailSupplementaryViewCollectionViewHeight]]];
+        _defaultHeightAnimationSteps = [NSArray arrayWithArray:[self generateAnimationStepsForExpandedViewHeight:VLCLibraryUIUnits.mediumDetailSupplementaryViewCollectionViewHeight]];
+        _largeHeightAnimationSteps = [NSArray arrayWithArray:[self generateAnimationStepsForExpandedViewHeight:VLCLibraryUIUnits.largeDetailSupplementaryViewCollectionViewHeight]];
        
        _animationType = VLCExpandAnimationTypeDefault;
        _prevProvidedAnimationStep = 0;
@ -278,7 +278,7 @@ static CVReturn detailViewAnimationCallback(CVDisplayLinkRef displayLink,
        
        float selectedItemFrameMaxY = _selectedIndexPath == nil ? 0 : NSMaxY([[self layoutAttributesForItemAtIndexPath:_selectedIndexPath] frame]);
        detailViewAttributes.frame = NSMakeRect(NSMinX(self.collectionView.frame) + self.minimumInteritemSpacing,
-                                                selectedItemFrameMaxY + [VLCLibraryUIUnits mediumSpacing],
+                                                selectedItemFrameMaxY + VLCLibraryUIUnits.mediumSpacing,
                                                self.collectionViewContentSize.width - (self.minimumInteritemSpacing * 2),
                                                [self currentAnimationStep]);

@ -322,7 +322,7 @@ static CVReturn detailViewAnimationCallback(CVDisplayLinkRef displayLink,
        NSRect selectedItemFrame = selectedItemLayoutAttributes.frame;
        
        if (NSMinY(attributesFrame) > (NSMaxY(selectedItemFrame))) {
-            attributesFrame.origin.y += [self currentAnimationStep] + [VLCLibraryUIUnits mediumSpacing];
+            attributesFrame.origin.y += [self currentAnimationStep] + VLCLibraryUIUnits.mediumSpacing;
        }
    }

--- a/modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
+++ b/modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
@ -78,11 +78,11 @@ const CGFloat VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;

 + (const CGFloat)bottomTextViewsHeight
 {
-    return [VLCLibraryUIUnits smallSpacing] +
+    return VLCLibraryUIUnits.smallSpacing +
           16 +
-           [VLCLibraryUIUnits smallSpacing] +
+           VLCLibraryUIUnits.smallSpacing +
           16 +
-           [VLCLibraryUIUnits smallSpacing];
+           VLCLibraryUIUnits.smallSpacing;
 }

 + (const CGFloat)videoHeightAspectRatioMultiplier
--- a/modules/gui/macosx/library/VLCLibraryInformationPanel.m
+++ b/modules/gui/macosx/library/VLCLibraryInformationPanel.m
@ -45,10 +45,10 @@
 {
    [super windowDidLoad];

-    _titleTextFieldTopConstraint.constant = self.window.titlebarHeight + [VLCLibraryUIUnits smallSpacing];
+    _titleTextFieldTopConstraint.constant = self.window.titlebarHeight + VLCLibraryUIUnits.smallSpacing;

    NSEdgeInsets scrollViewInsets = _scrollView.contentInsets;
-    scrollViewInsets.top = _topBarView.frame.size.height + [VLCLibraryUIUnits mediumSpacing];
+    scrollViewInsets.top = _topBarView.frame.size.height + VLCLibraryUIUnits.mediumSpacing;
    _scrollView.contentInsets = scrollViewInsets;

    _boldSystemFont = [NSFont boldSystemFontOfSize:NSFont.systemFontSize];
--- a/modules/gui/macosx/library/VLCLibraryTwoPaneSplitViewDelegate.m
+++ b/modules/gui/macosx/library/VLCLibraryTwoPaneSplitViewDelegate.m
@ -41,7 +41,7 @@ constrainMaxCoordinate:(CGFloat)proposedMinimumPosition
    const CGFloat libraryWindowWidth = libraryWindow.frame.size.width;

    NSNumber * const leftPaneIndex = [NSNumber numberWithLong:0];
-    NSNumber * const leftPaneMaxWidth = [NSNumber numberWithDouble:libraryWindowWidth - [VLCLibraryUIUnits librarySplitViewMainViewMinimumWidth]];
+    NSNumber * const leftPaneMaxWidth = [NSNumber numberWithDouble:libraryWindowWidth - VLCLibraryUIUnits.librarySplitViewMainViewMinimumWidth];

    return leftPaneMaxWidth.floatValue;
 }
--- a/modules/gui/macosx/library/VLCLibraryUIUnits.m
+++ b/modules/gui/macosx/library/VLCLibraryUIUnits.m
@ -105,14 +105,14 @@
                                 withItemsAspectRatio:itemsAspectRatio
                               withNumberOfItemsInRow:numItemsInRow];

-    while (itemSize.width > [VLCLibraryUIUnits dynamicCollectionViewItemMaximumWidth]) {
+    while (itemSize.width > VLCLibraryUIUnits.dynamicCollectionViewItemMaximumWidth) {
        ++numItemsInRow;
        itemSize = [self itemSizeForCollectionView:collectionView
                                        withLayout:collectionViewLayout
                              withItemsAspectRatio:itemsAspectRatio
                            withNumberOfItemsInRow:numItemsInRow];
    }
-    while (itemSize.width < [VLCLibraryUIUnits dynamicCollectionViewItemMinimumWidth] && numItemsInRow > minItemsInRow) {
+    while (itemSize.width < VLCLibraryUIUnits.dynamicCollectionViewItemMinimumWidth && numItemsInRow > minItemsInRow) {
        --numItemsInRow;
        itemSize = [self itemSizeForCollectionView:collectionView
                                        withLayout:collectionViewLayout
@ -151,10 +151,10 @@

 + (const NSEdgeInsets)libraryViewScrollViewContentInsets
 {
-    return NSEdgeInsetsMake([VLCLibraryUIUnits mediumSpacing],
-                            [VLCLibraryUIUnits mediumSpacing],
-                            [VLCLibraryUIUnits mediumSpacing],
-                            [VLCLibraryUIUnits mediumSpacing]);
+    return NSEdgeInsetsMake(VLCLibraryUIUnits.mediumSpacing,
+                            VLCLibraryUIUnits.mediumSpacing,
+                            VLCLibraryUIUnits.mediumSpacing,
+                            VLCLibraryUIUnits.mediumSpacing);
 }

 + (const NSEdgeInsets)libraryViewScrollViewScrollerInsets
--- a/modules/gui/macosx/library/VLCLibraryWindow.m
+++ b/modules/gui/macosx/library/VLCLibraryWindow.m
@ -223,7 +223,7 @@ static void addShadow(NSImageView *__unsafe_unretained imageView)

    _playlistTableView.dataSource = _playlistDataSource;
    _playlistTableView.delegate = _playlistDataSource;
-    _playlistTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
+    _playlistTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
    [_playlistTableView reloadData];

    _libraryVideoViewController = [[VLCLibraryVideoViewController alloc] initWithLibraryWindow:self];
--- a/modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m
+++ b/modules/gui/macosx/library/audio-library/VLCLibraryAlbumTableCellView.m
@ -79,25 +79,25 @@ const CGFloat VLCLibraryAlbumTableCellViewDefaultHeight = 168.;
        return -1;
    }

-    const CGFloat artworkAndSecondaryLabelsHeight = [VLCLibraryUIUnits largeSpacing] +
+    const CGFloat artworkAndSecondaryLabelsHeight = VLCLibraryUIUnits.largeSpacing +
                                                    _representedImageView.frame.size.height + 
-                                                    [VLCLibraryUIUnits mediumSpacing] +
+                                                    VLCLibraryUIUnits.mediumSpacing +
                                                    _summaryTextField.frame.size.height + 
-                                                    [VLCLibraryUIUnits smallSpacing] +
+                                                    VLCLibraryUIUnits.smallSpacing +
                                                    _yearTextField.frame.size.height + 
-                                                    [VLCLibraryUIUnits largeSpacing];
+                                                    VLCLibraryUIUnits.largeSpacing;
    
    if(_tracksTableView == nil) {
        return artworkAndSecondaryLabelsHeight;
    }

-    const CGFloat titleAndTableViewHeight = [VLCLibraryUIUnits largeSpacing] +
+    const CGFloat titleAndTableViewHeight = VLCLibraryUIUnits.largeSpacing +
                                            _albumNameTextField.frame.size.height +
-                                            [VLCLibraryUIUnits smallSpacing] +
+                                            VLCLibraryUIUnits.smallSpacing +
                                            _artistNameTextField.frame.size.height + 
-                                            [VLCLibraryUIUnits smallSpacing] +
+                                            VLCLibraryUIUnits.smallSpacing +
                                            [self expectedTableViewHeight] +
-                                            [VLCLibraryUIUnits largeSpacing];
+                                            VLCLibraryUIUnits.largeSpacing;

    return titleAndTableViewHeight > artworkAndSecondaryLabelsHeight ? titleAndTableViewHeight : artworkAndSecondaryLabelsHeight;
 }
@ -108,14 +108,14 @@ const CGFloat VLCLibraryAlbumTableCellViewDefaultHeight = 168.;
    // to take into account the album's left spacing, right spacing, and the table view's
    // right spacing. In this case we are using large spacing for all of these. We also
    // throw in a little bit extra spacing to compensate for some mysterious internal spacing.
-    return self.frame.size.width - _representedImageView.frame.size.width - [VLCLibraryUIUnits largeSpacing] * 3.75;
+    return self.frame.size.width - _representedImageView.frame.size.width - VLCLibraryUIUnits.largeSpacing * 3.75;
 }

 - (CGFloat)expectedTableViewHeight
 {
    const NSUInteger numberOfTracks = _representedAlbum.numberOfTracks;
    const CGFloat intercellSpacing = numberOfTracks > 1 ? (numberOfTracks - 1) * _tracksTableView.intercellSpacing.height : 0;
-    return numberOfTracks * VLCLibraryTracksRowHeight + intercellSpacing + [VLCLibraryUIUnits mediumSpacing];
+    return numberOfTracks * VLCLibraryTracksRowHeight + intercellSpacing + VLCLibraryUIUnits.mediumSpacing;
 }

 - (void)awakeFromNib
@ -161,14 +161,14 @@ const CGFloat VLCLibraryAlbumTableCellViewDefaultHeight = 168.;
    _tracksTableView.translatesAutoresizingMaskIntoConstraints = NO;
    [self addSubview:_tracksTableView];
    NSString *horizontalVisualConstraints = [NSString stringWithFormat:@"H:|-%f-[_representedImageView]-%f-[_tracksTableView]-%f-|",
-                                             [VLCLibraryUIUnits largeSpacing],
-                                             [VLCLibraryUIUnits largeSpacing],
-                                             [VLCLibraryUIUnits largeSpacing]];
+                                             VLCLibraryUIUnits.largeSpacing,
+                                             VLCLibraryUIUnits.largeSpacing,
+                                             VLCLibraryUIUnits.largeSpacing];
    NSString *verticalVisualContraints = [NSString stringWithFormat:@"V:|-%f-[_albumNameTextField]-%f-[_artistNameTextField]-%f-[_tracksTableView]->=%f-|",
-                                          [VLCLibraryUIUnits largeSpacing],
-                                          [VLCLibraryUIUnits smallSpacing],
-                                          [VLCLibraryUIUnits mediumSpacing],
-                                          [VLCLibraryUIUnits largeSpacing]];
+                                          VLCLibraryUIUnits.largeSpacing,
+                                          VLCLibraryUIUnits.smallSpacing,
+                                          VLCLibraryUIUnits.mediumSpacing,
+                                          VLCLibraryUIUnits.largeSpacing];
    NSDictionary *dict = NSDictionaryOfVariableBindings(_tracksTableView, _representedImageView, _albumNameTextField, _artistNameTextField);
    [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:horizontalVisualConstraints options:0 metrics:0 views:dict]];
    [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:verticalVisualContraints options:0 metrics:0 views:dict]];
--- a/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
+++ b/modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
@ -153,7 +153,7 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
    _audioLibraryCollectionView.allowsMultipleSelection = NO;
    _audioLibraryCollectionView.allowsEmptySelection = YES;

-    const CGFloat collectionItemSpacing = [VLCLibraryUIUnits collectionViewItemSpacing];
+    const CGFloat collectionItemSpacing = VLCLibraryUIUnits.collectionViewItemSpacing;
    const NSEdgeInsets collectionViewSectionInset = [VLCLibraryUIUnits collectionViewSectionInsets];

    NSCollectionViewFlowLayout *audioLibraryCollectionViewLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];
@ -195,7 +195,7 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi
    _audioLibraryGridModeSplitViewListSelectionCollectionView.allowsMultipleSelection = NO;
    _audioLibraryGridModeSplitViewListSelectionCollectionView.allowsEmptySelection = YES;

-    const CGFloat collectionItemSpacing = [VLCLibraryUIUnits collectionViewItemSpacing];
+    const CGFloat collectionItemSpacing = VLCLibraryUIUnits.collectionViewItemSpacing;
    const NSEdgeInsets collectionViewSectionInset = [VLCLibraryUIUnits collectionViewSectionInsets];

    NSCollectionViewFlowLayout *audioLibraryGridModeListSelectionCollectionViewLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];
@ -252,17 +252,17 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier = @"VLCLibraryPlaceholderAudi

 - (void)setupAudioLibraryViews
 {
-    _audioCollectionSelectionTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
-    _audioLibraryGridModeSplitViewListTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
+    _audioCollectionSelectionTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
+    _audioLibraryGridModeSplitViewListTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
    _audioGroupSelectionTableView.rowHeight = VLCLibraryAlbumTableCellView.defaultHeight;

-    const NSEdgeInsets defaultContentInsets = [VLCLibraryUIUnits libraryViewScrollViewContentInsets];
+    const NSEdgeInsets defaultContentInsets = VLCLibraryUIUnits.libraryViewScrollViewContentInsets;
    const CGFloat topAudioScrollViewContentInset = defaultContentInsets.top + _optionBarView.frame.size.height;
    const NSEdgeInsets audioScrollViewContentInsets = NSEdgeInsetsMake(topAudioScrollViewContentInset,
                                                                       defaultContentInsets.left,
                                                                       defaultContentInsets.bottom,
                                                                       defaultContentInsets.right);
-    const NSEdgeInsets audioScrollViewScrollerInsets = [VLCLibraryUIUnits libraryViewScrollViewScrollerInsets];
+    const NSEdgeInsets audioScrollViewScrollerInsets = VLCLibraryUIUnits.libraryViewScrollViewScrollerInsets;

    _audioCollectionViewScrollView.automaticallyAdjustsContentInsets = NO;
    _audioCollectionViewScrollView.contentInsets = audioScrollViewContentInsets;
--- a/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
+++ b/modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
@ -78,7 +78,7 @@

 - (void)setupCollectionView
 {
-    const CGFloat collectionItemSpacing = [VLCLibraryUIUnits collectionViewItemSpacing];
+    const CGFloat collectionItemSpacing = VLCLibraryUIUnits.collectionViewItemSpacing;
    const NSEdgeInsets collectionViewSectionInset = [VLCLibraryUIUnits collectionViewSectionInsets];
    
    NSCollectionViewFlowLayout *mediaSourceCollectionViewLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];
@ -91,10 +91,10 @@

 - (void)setupMediaSourceLibraryViews
 {
-    _mediaSourceTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
+    _mediaSourceTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;

-    const NSEdgeInsets defaultInsets = [VLCLibraryUIUnits libraryViewScrollViewContentInsets];
-    const NSEdgeInsets scrollerInsets = [VLCLibraryUIUnits libraryViewScrollViewScrollerInsets];
+    const NSEdgeInsets defaultInsets = VLCLibraryUIUnits.libraryViewScrollViewContentInsets;
+    const NSEdgeInsets scrollerInsets = VLCLibraryUIUnits.libraryViewScrollViewScrollerInsets;

    _collectionViewScrollView.automaticallyAdjustsContentInsets = NO;
    _collectionViewScrollView.contentInsets = defaultInsets;
--- a/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.m
+++ b/modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.m
@ -471,8 +471,8 @@ referenceSizeForHeaderInSection:(NSInteger)section
 {
    _homeButton.hidden = !visible;
    _pathControl.hidden = !visible;
-    _pathControlBottomTableViewScrollViewConstraint.constant = visible ? [VLCLibraryUIUnits mediumSpacing] : 0;
-    _pathControlBottomCollectionViewScrollViewConstraint.constant = visible ? [VLCLibraryUIUnits mediumSpacing] : 0;
+    _pathControlBottomTableViewScrollViewConstraint.constant = visible ? VLCLibraryUIUnits.mediumSpacing : 0;
+    _pathControlBottomCollectionViewScrollViewConstraint.constant = visible ? VLCLibraryUIUnits.mediumSpacing : 0;
 }

 - (void)returnHome
--- a/modules/gui/macosx/library/video-library/VLCLibraryVideoCollectionViewContainerView.m
+++ b/modules/gui/macosx/library/video-library/VLCLibraryVideoCollectionViewContainerView.m
@ -104,7 +104,7 @@
 {
    _collectionViewLayout = [[VLCLibraryCollectionViewFlowLayout alloc] init];

-    const CGFloat collectionItemSpacing = [VLCLibraryUIUnits collectionViewItemSpacing];
+    const CGFloat collectionItemSpacing = VLCLibraryUIUnits.collectionViewItemSpacing;
    const NSEdgeInsets collectionViewSectionInset = [VLCLibraryUIUnits collectionViewSectionInsets];
    _collectionViewLayout.headerReferenceSize = VLCLibraryCollectionViewSupplementaryElementView.defaultHeaderSize;
    _collectionViewLayout.minimumLineSpacing = collectionItemSpacing;
@ -210,7 +210,7 @@
    }

    if (_groupDescriptor.isHorizontalBarCollectionView) {
-        const CGFloat viewHeight = itemHeight + insetsHeight + [VLCLibraryUIUnits scrollBarSmallSideSize];
+        const CGFloat viewHeight = itemHeight + insetsHeight + VLCLibraryUIUnits.smallSpacing;
        return NSMakeSize(width, viewHeight);
    }

--- a/modules/gui/macosx/library/video-library/VLCLibraryVideoCollectionViewsStackViewController.m
+++ b/modules/gui/macosx/library/video-library/VLCLibraryVideoCollectionViewsStackViewController.m
@ -91,7 +91,7 @@
    }

    _collectionsStackView = collectionsStackView;
-    _collectionsStackView.spacing = [VLCLibraryUIUnits largeSpacing];
+    _collectionsStackView.spacing = VLCLibraryUIUnits.largeSpacing;
    _collectionsStackView.orientation = NSUserInterfaceLayoutOrientationVertical;
    _collectionsStackView.alignment = NSLayoutAttributeLeading;
    _collectionsStackView.distribution = NSStackViewDistributionFill;
--- a/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
+++ b/modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
@ -149,11 +149,11 @@

 - (void)setupVideoLibraryViews
 {
-    _videoLibraryGroupsTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
-    _videoLibraryGroupSelectionTableView.rowHeight = [VLCLibraryUIUnits mediumTableViewRowHeight];
+    _videoLibraryGroupsTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;
+    _videoLibraryGroupSelectionTableView.rowHeight = VLCLibraryUIUnits.mediumTableViewRowHeight;

-    const NSEdgeInsets defaultInsets = [VLCLibraryUIUnits libraryViewScrollViewContentInsets];
-    const NSEdgeInsets scrollerInsets = [VLCLibraryUIUnits libraryViewScrollViewScrollerInsets];
+    const NSEdgeInsets defaultInsets = VLCLibraryUIUnits.libraryViewScrollViewContentInsets;
+    const NSEdgeInsets scrollerInsets = VLCLibraryUIUnits.libraryViewScrollViewScrollerInsets;

    _videoLibraryCollectionViewsStackViewScrollView.automaticallyAdjustsContentInsets = NO;
    _videoLibraryCollectionViewsStackViewScrollView.contentInsets = defaultInsets;
--- a/modules/gui/macosx/preferences/prefs_widgets.m
+++ b/modules/gui/macosx/preferences/prefs_widgets.m
@ -917,8 +917,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *o_textfieldString, *o_textfieldTooltip;
@ -997,8 +997,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *o_textfieldTooltip;
@ -1101,8 +1101,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *o_itemTooltip, *o_textfieldString;
@ -1191,8 +1191,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *o_popupTooltip;
@ -1327,8 +1327,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -1419,8 +1419,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *o_textfieldTooltip;
@ -1512,8 +1512,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -1627,8 +1627,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -1721,8 +1721,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -1833,8 +1833,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -1883,8 +1883,8 @@ my_width, tooltip, init_value)                                              \
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString, *toolTip;
@ -2062,8 +2062,8 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
    } /* FOR i_module_index */
    module_list_free(p_list);

-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    // First, initialize and draw the table view to get its height
    // width is increased a little to fix horizontal auto-sizing
@ -2283,8 +2283,8 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
 - (id)initWithItem:(module_config_t *)p_item
          withView:(NSView *)parentView
 {
-    const NSUInteger leftMargin = [VLCLibraryUIUnits largeSpacing];
-    const NSUInteger rightMargin = [VLCLibraryUIUnits largeSpacing];
+    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
+    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;

    NSRect mainFrame = [parentView frame];
    NSString *labelString;
--- a/modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m
+++ b/modules/gui/macosx/windows/video/VLCFullVideoViewWindow.m
@ -92,7 +92,7 @@

    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
        self->_isFadingIn = YES;
-        [context setDuration:[VLCLibraryUIUnits controlsFadeAnimationDuration]];
+        [context setDuration:VLCLibraryUIUnits.controlsFadeAnimationDuration];
        [titlebarView.animator setAlphaValue:1.0f];
    } completionHandler:^{
        self->_isFadingIn = NO;
@ -117,7 +117,7 @@
    NSView *titlebarView = [self standardWindowButton:NSWindowCloseButton].superview;

    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
-        [context setDuration:[VLCLibraryUIUnits controlsFadeAnimationDuration]];
+        [context setDuration:VLCLibraryUIUnits.controlsFadeAnimationDuration];
        [titlebarView.animator setAlphaValue:0.0f];
    } completionHandler:nil];
 }
--- a/modules/gui/macosx/windows/video/VLCMainVideoViewController.m
+++ b/modules/gui/macosx/windows/video/VLCMainVideoViewController.m
@ -214,7 +214,7 @@
    }

    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
-        [context setDuration:[VLCLibraryUIUnits controlsFadeAnimationDuration]];
+        [context setDuration:VLCLibraryUIUnits.controlsFadeAnimationDuration];
        [self->_mainControlsView.animator setAlphaValue:0.0f];
    } completionHandler:nil];
 }
@ -252,7 +252,7 @@

    [NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
        self->_isFadingIn = YES;
-        [context setDuration:[VLCLibraryUIUnits controlsFadeAnimationDuration]];
+        [context setDuration:VLCLibraryUIUnits.controlsFadeAnimationDuration];
        [self->_mainControlsView.animator setAlphaValue:1.0f];
    } completionHandler:^{
        self->_isFadingIn = NO;
@ -314,7 +314,7 @@
    const BOOL placeInFakeToolbar = viewWindow.titlebarAppearsTransparent &&
                                    !windowFullscreen;

-    const CGFloat buttonTopSpace = placeInFakeToolbar ? 0 : [VLCLibraryUIUnits largeSpacing];
+    const CGFloat buttonTopSpace = placeInFakeToolbar ? 0 : VLCLibraryUIUnits.largeSpacing;

    _fakeTitleBarHeightConstraint.constant = windowFullscreen ? 0 : windowTitlebarHeight;

@ -354,8 +354,8 @@
    const CGFloat realButtonSpace = (windowTitlebarHeight - _playlistButton.cell.cellSize.height) / 2;
    const NSRect windowButtonBox = [self windowButtonsRect];

-    _returnButtonLeadingConstraint.constant = placeInFakeToolbar ? windowButtonBox.size.width + [VLCLibraryUIUnits mediumSpacing] + realButtonSpace : [VLCLibraryUIUnits largeSpacing];
-    _playlistButtonTrailingConstraint.constant = placeInFakeToolbar ? realButtonSpace: [VLCLibraryUIUnits largeSpacing];
+    _returnButtonLeadingConstraint.constant = placeInFakeToolbar ? windowButtonBox.size.width + VLCLibraryUIUnits.mediumSpacing + realButtonSpace : VLCLibraryUIUnits.largeSpacing;
+    _playlistButtonTrailingConstraint.constant = placeInFakeToolbar ? realButtonSpace: VLCLibraryUIUnits.largeSpacing;

    _overlayView.drawGradientForTopControls = !placeInFakeToolbar;
    [_overlayView drawRect:_overlayView.frame];