Revision: 14756
http://sourceforge.net/p/skim-app/code/14756
Author: hofman
Date: 2024-11-27 10:41:44 +0000 (Wed, 27 Nov 2024)
Log Message:
-----------
use aSplitView as parameter name of delegate method
Modified Paths:
--------------
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2024-11-27 10:39:41 UTC (rev 14755)
+++ trunk/SKMainWindowController_UI.m 2024-11-27 10:41:44 UTC (rev 14756)
@@ -1583,9 +1583,9 @@
#pragma mark NSSplitView delegate protocol
- (BOOL)splitView:(NSSplitView *)aSplitView canCollapseSubview:(NSView
*)subview {
- if ([sender isEqual:splitView]) {
+ if ([aSplitView isEqual:splitView]) {
return [subview isEqual:centerContentView] == NO;
- } else if ([sender isEqual:pdfSplitView]) {
+ } else if ([aSplitView isEqual:pdfSplitView]) {
return [subview isEqual:secondaryPdfView];
}
return NO;
@@ -1592,12 +1592,12 @@
}
- (BOOL)splitView:(NSSplitView *)aSplitView shouldCollapseSubview:(NSView
*)subview forDoubleClickOnDividerAtIndex:(NSInteger)dividerIndex {
- if ([sender isEqual:splitView]) {
+ if ([aSplitView isEqual:splitView]) {
if ([subview isEqual:leftSideContentView])
- [self toggleLeftSidePane:sender];
+ [self toggleLeftSidePane:aSplitView];
else if ([subview isEqual:rightSideContentView])
- [self toggleRightSidePane:sender];
- } else if ([sender isEqual:pdfSplitView]) {
+ [self toggleRightSidePane:aSplitView];
+ } else if ([aSplitView isEqual:pdfSplitView]) {
if ([subview isEqual:secondaryPdfView]) {
CGFloat position = [pdfSplitView
maxPossiblePositionOfDividerAtIndex:dividerIndex];
if ([pdfSplitView isSubviewCollapsed:secondaryPdfView]) {
@@ -1616,56 +1616,56 @@
}
- (BOOL)splitView:(NSSplitView *)aSplitView
shouldHideDividerAtIndex:(NSInteger)dividerIndex {
- return [sender isEqual:splitView];
+ return [aSplitView isEqual:splitView];
}
- (CGFloat)splitView:(NSSplitView *)aSplitView
constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex
{
- if ([sender respondsToSelector:@selector(isAnimating)] && [(SKSplitView
*)sender isAnimating])
+ if ([aSplitView respondsToSelector:@selector(isAnimating)] &&
[(SKSplitView *)aSplitView isAnimating])
return proposedMax;
- else if ([sender isEqual:splitView] && dividerIndex == 1)
+ else if ([aSplitView isEqual:splitView] && dividerIndex == 1)
return proposedMax - MIN_SIDE_PANE_WIDTH;
- else if ([sender isEqual:pdfSplitView])
+ else if ([aSplitView isEqual:pdfSplitView])
return proposedMax - MIN_SPLIT_PANE_HEIGHT;
return proposedMax;
}
- (CGFloat)splitView:(NSSplitView *)aSplitView
constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex
{
- if ([sender respondsToSelector:@selector(isAnimating)] && [(SKSplitView
*)sender isAnimating])
+ if ([aSplitView respondsToSelector:@selector(isAnimating)] &&
[(SKSplitView *)aSplitView isAnimating])
return proposedMin;
- else if ([sender isEqual:splitView] && dividerIndex == 0)
+ else if ([aSplitView isEqual:splitView] && dividerIndex == 0)
return proposedMin + MIN_SIDE_PANE_WIDTH;
- else if ([sender isEqual:pdfSplitView])
+ else if ([aSplitView isEqual:pdfSplitView])
return proposedMin + titleBarHeight + MIN_PDF_PANE_HEIGHT;
return proposedMin;
}
- (void)splitView:(NSSplitView *)aSplitView
resizeSubviewsWithOldSize:(NSSize)oldSize {
- if ([sender isEqual:splitView]) {
- NSView *leftView = [[sender subviews] objectAtIndex:0];
- NSView *mainView = [[sender subviews] objectAtIndex:1];
- NSView *rightView = [[sender subviews] objectAtIndex:2];
- BOOL leftCollapsed = [sender isSubviewCollapsed:leftView];
- BOOL rightCollapsed = [sender isSubviewCollapsed:rightView];
+ if ([aSplitView isEqual:splitView]) {
+ NSView *leftView = [[aSplitView subviews] objectAtIndex:0];
+ NSView *mainView = [[aSplitView subviews] objectAtIndex:1];
+ NSView *rightView = [[aSplitView subviews] objectAtIndex:2];
+ BOOL leftCollapsed = [aSplitView isSubviewCollapsed:leftView];
+ BOOL rightCollapsed = [aSplitView isSubviewCollapsed:rightView];
NSSize leftSize = [leftView frame].size;
NSSize mainSize = [mainView frame].size;
NSSize rightSize = [rightView frame].size;
- CGFloat contentWidth = NSWidth([sender frame]);
+ CGFloat contentWidth = NSWidth([aSplitView frame]);
if (leftCollapsed)
leftSize.width = 0.0;
else
- contentWidth -= [sender dividerThickness];
+ contentWidth -= [aSplitView dividerThickness];
if (rightCollapsed)
rightSize.width = 0.0;
else
- contentWidth -= [sender dividerThickness];
+ contentWidth -= [aSplitView dividerThickness];
if (contentWidth < leftSize.width + rightSize.width) {
CGFloat oldContentWidth = oldSize.width;
if (leftCollapsed == NO)
- oldContentWidth -= [sender dividerThickness];
+ oldContentWidth -= [aSplitView dividerThickness];
if (rightCollapsed == NO)
- oldContentWidth -= [sender dividerThickness];
+ oldContentWidth -= [aSplitView dividerThickness];
CGFloat resizeFactor = contentWidth / oldContentWidth;
leftSize.width = floor(resizeFactor * leftSize.width);
rightSize.width = floor(resizeFactor * rightSize.width);
@@ -1672,18 +1672,18 @@
}
mainSize.width = contentWidth - leftSize.width - rightSize.width;
- leftSize.height = rightSize.height = mainSize.height =
NSHeight([sender frame]);
+ leftSize.height = rightSize.height = mainSize.height =
NSHeight([aSplitView frame]);
if (leftCollapsed == NO)
[leftView setFrameSize:leftSize];
if (rightCollapsed == NO)
[rightView setFrameSize:rightSize];
[mainView setFrameSize:mainSize];
- } else if ([sender isEqual:pdfSplitView] && [[sender subviews] count] > 1)
{
- NSView *topView = [[sender subviews] objectAtIndex:0];
- NSView *bottomView = [[sender subviews] objectAtIndex:1];
+ } else if ([aSplitView isEqual:pdfSplitView] && [[aSplitView subviews]
count] > 1) {
+ NSView *topView = [[aSplitView subviews] objectAtIndex:0];
+ NSView *bottomView = [[aSplitView subviews] objectAtIndex:1];
NSSize topSize = [topView frame].size;
NSSize bottomSize = [bottomView frame].size;
- CGFloat contentHeight = NSHeight([sender frame]) - [sender
dividerThickness];
+ CGFloat contentHeight = NSHeight([aSplitView frame]) - [aSplitView
dividerThickness];
if (bottomSize.height <= 0.0 || contentHeight < titleBarHeight +
MIN_PDF_PANE_HEIGHT + MIN_SPLIT_PANE_HEIGHT) {
topSize.height = contentHeight;
@@ -1690,10 +1690,10 @@
bottomSize.height = 0.0;
} else {
if (rand() % 2 == 0) {
- topSize.height = floor(contentHeight * topSize.height /
(oldSize.height - [sender dividerThickness]));
+ topSize.height = floor(contentHeight * topSize.height /
(oldSize.height - [aSplitView dividerThickness]));
bottomSize.height = contentHeight - topSize.height;
} else {
- bottomSize.height = floor(contentHeight * bottomSize.height /
(oldSize.height - [sender dividerThickness]));
+ bottomSize.height = floor(contentHeight * bottomSize.height /
(oldSize.height - [aSplitView dividerThickness]));
topSize.height = contentHeight - bottomSize.height;
}
if (bottomSize.height < MIN_SPLIT_PANE_HEIGHT) {
@@ -1704,11 +1704,11 @@
bottomSize.height = contentHeight - titleBarHeight -
MIN_PDF_PANE_HEIGHT;
}
}
- topSize.width = bottomSize.width = NSWidth([sender frame]);
+ topSize.width = bottomSize.width = NSWidth([aSplitView frame]);
[topView setFrameSize:topSize];
[bottomView setFrameSize:bottomSize];
}
- [sender adjustSubviews];
+ [aSplitView adjustSubviews];
}
- (void)splitViewDidResizeSubviews:(NSNotification *)notification {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
