diff --git a/modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib b/modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
index 962b14bcb6..f2b243a994 100644
--- a/modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
+++ b/modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
@@ -15,6 +15,8 @@
+
+
@@ -29,14 +31,14 @@
-
+
-
+
-
+
@@ -102,16 +104,16 @@
-
+
-
+
-
+
-
+
diff --git a/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h b/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
index 2d09099b74..7d9d9e255d 100644
--- a/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
+++ b/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
@@ -48,6 +48,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (readwrite, weak) IBOutlet NSStackView *buttonStack;
@property (readwrite, weak) IBOutlet NSScrollView *scrollView;
@property (readwrite, weak) IBOutlet NSLayoutConstraint *footerContainerViewDefaultBottomConstraint;
+@property (readwrite, weak) IBOutlet NSLayoutConstraint *footerContainerViewLeadingConstraint;
+@property (readwrite, weak) IBOutlet NSLayoutConstraint *footerContainerViewTrailingConstraint;
@property (readwrite, weak) IBOutlet NSLayoutConstraint *scrollViewDefaultBottomConstraint;
@property (readwrite, nonatomic) NSTextField *counterLabel;
diff --git a/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m b/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
index 43113d9338..eb940cb2ed 100644
--- a/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
+++ b/modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
@@ -96,10 +96,10 @@
- (void)setupBlurredHeaderFooter
{
+ const CGFloat footerHeight = self.footerContainerView.frame.size.height;
+
if (@available(macOS 26.0, *)) {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000
- const CGFloat footerHeight = self.footerContainerView.frame.size.height;
-
[self.bottomButtonsSeparator removeFromSuperview];
NSGlassEffectView * const glassFooterView = [[NSGlassEffectView alloc] init];
@@ -111,20 +111,32 @@
self.footerContainerView.clipsToBounds = NO;
[glassFooterView applyConstraintsToFillSuperview];
+ self.buttonStack.edgeInsets = NSEdgeInsetsMake(
+ VLCLibraryUIUnits.mediumSpacing,
+ VLCLibraryUIUnits.largeSpacing,
+ VLCLibraryUIUnits.mediumSpacing,
+ VLCLibraryUIUnits.largeSpacing
+ );
+
self.scrollViewDefaultBottomConstraint.active = NO;
self.footerContainerViewDefaultBottomConstraint.active = NO;
+ self.footerContainerViewLeadingConstraint.constant = VLCLibraryUIUnits.largeSpacing;
+ self.footerContainerViewTrailingConstraint.constant = VLCLibraryUIUnits.largeSpacing;
+
+ NSLayoutConstraint * const footerBottomConstraint =
+ [self.buttonStack.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor
+ constant:-VLCLibraryUIUnits.largeSpacing];
[NSLayoutConstraint activateConstraints:@[
[self.scrollView.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor],
- [self.buttonStack.bottomAnchor constraintEqualToAnchor:self.view.bottomAnchor constant:-VLCLibraryUIUnits.mediumSpacing]
+ footerBottomConstraint
]];
+ const CGFloat footerTopLine = footerHeight + -footerBottomConstraint.constant + VLCLibraryUIUnits.smallSpacing;
self.scrollView.automaticallyAdjustsContentInsets = NO;
- self.scrollView.contentInsets = NSEdgeInsetsMake(0, 0, footerHeight, 0);
+ self.scrollView.contentInsets = NSEdgeInsetsMake(0, 0, footerTopLine, 0);
#endif
} else if (@available(macOS 10.14, *)) {
- const CGFloat footerHeight = self.footerContainerView.frame.size.height;
-
NSVisualEffectView * const footerBlurView = [[NSVisualEffectView alloc] initWithFrame:self.footerContainerView.bounds];
footerBlurView.translatesAutoresizingMaskIntoConstraints = NO;
footerBlurView.material = NSVisualEffectMaterialHeaderView;