avoid losing the splitter

SubmarinerApp · Dec 23, 2023 · 4ccd4d0 · 4ccd4d0
1 parent af34d80
commit 4ccd4d0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/Submariner/SBMusicController.m b/Submariner/SBMusicController.m
@@ -79,6 +79,7 @@ - (void)awakeFromNib {
     [super awakeFromNib];
     self->compensatedSplitView = self->rightSplitView;
     // so it doesn't resize unless the user does so
+    rightSplitView.delegate = self;
     artistSplitView.delegate = self;
 }
 
@@ -774,6 +775,21 @@ - (BOOL)splitView:(NSSplitView *)splitView shouldAdjustSizeOfSubview:(NSView *)v
     return YES;
 }
 
+- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview {
+    if (splitView == rightSplitView && subview == splitView.subviews.firstObject) {
+        return NO;
+    }
+    return YES;
+}
+
+- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex {
+    if (splitView == rightSplitView && dividerIndex ==  0) {
+        // Prevent the splitter from going above the toolbar
+        return MAX(self.view.safeAreaInsets.top, 0);
+    }
+    return proposedMinimumPosition;
+}
+
 
 #pragma mark -
 #pragma mark UI Validator

diff --git a/Submariner/SBServerLibraryController.m b/Submariner/SBServerLibraryController.m
@@ -101,6 +101,7 @@ - (void)awakeFromNib {
 
     self->compensatedSplitView = self->rightSplitView;
     // so it doesn't resize unless the user does so
+    rightSplitView.delegate = self;
     artistSplitView.delegate = self;
 }
 
@@ -643,6 +644,21 @@ - (BOOL)splitView:(NSSplitView *)splitView shouldAdjustSizeOfSubview:(NSView *)v
     return YES;
 }
 
+- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview {
+    if (splitView == rightSplitView && subview == splitView.subviews.firstObject) {
+        return NO;
+    }
+    return YES;
+}
+
+- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex {
+    if (splitView == rightSplitView && dividerIndex ==  0) {
+        // Prevent the splitter from going above the toolbar
+        return MAX(self.view.safeAreaInsets.top, 0);
+    }
+    return proposedMinimumPosition;
+}
+
 
 #pragma mark -
 #pragma mark UI Validator