Revision: 15490
http://sourceforge.net/p/skim-app/code/15490
Author: hofman
Date: 2025-06-18 14:21:42 +0000 (Wed, 18 Jun 2025)
Log Message:
-----------
remove state parameter in side view swapping methods, as it is always equal toi
the current state
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2025-06-18 14:14:19 UTC (rev 15489)
+++ trunk/SKMainWindowController.h 2025-06-18 14:21:42 UTC (rev 15490)
@@ -285,9 +285,9 @@
- (void)hideOverviewAnimating:(BOOL)animate;
- (void)hideOverviewAnimating:(BOOL)animate completionHandler:(nullable void
(^)(void))handler;
-- (void)displayLeftSideView:(SKLeftSidePaneState)state animating:(BOOL)animate;
-- (void)displayFindView:(SKFindPaneState)state animating:(BOOL)animate;
-- (void)displayRightSideView:(SKRightSidePaneState)state
animating:(BOOL)animate;
+- (void)displayLeftSideViewAnimating:(BOOL)animate;
+- (void)displayFindViewAnimating:(BOOL)animate;
+- (void)displayRightSideViewAnimating:(BOOL)animate;
- (void)showFindBar;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-06-18 14:14:19 UTC (rev 15489)
+++ trunk/SKMainWindowController.m 2025-06-18 14:21:42 UTC (rev 15490)
@@ -354,8 +354,8 @@
[self updateTableFont];
- [self displayLeftSideView:SKSidePaneStateThumbnail animating:NO];
- [self displayRightSideView:SKSidePaneStateNote animating:NO];
+ [self displayLeftSideViewAnimating:NO];
+ [self displayRightSideViewAnimating:NO];
// we need to create the PDFView before setting the toolbar
pdfView = [[SKPDFView alloc] initWithFrame:[pdfContentView bounds]];
@@ -1297,7 +1297,7 @@
if (mwcFlags.leftSidePaneState != newLeftSidePaneState || [self
displaysFindPane]) {
mwcFlags.leftSidePaneState = newLeftSidePaneState;
- [self displayLeftSideView:mwcFlags.leftSidePaneState animating:NO];
+ [self displayLeftSideViewAnimating:NO];
}
}
@@ -1315,7 +1315,7 @@
mwcFlags.rightSidePaneState = newRightSidePaneState;
- [self displayRightSideView:mwcFlags.rightSidePaneState animating:NO];
+ [self displayRightSideViewAnimating:NO];
}
}
@@ -1327,12 +1327,12 @@
if (mwcFlags.findPaneState != newFindPaneState) {
mwcFlags.findPaneState = newFindPaneState;
- [self displayFindView:mwcFlags.findPaneState animating:NO];
+ [self displayFindViewAnimating:NO];
[self updateFindResultHighlightsForDirection:NSDirectSelection];
} else if ([self displaysFindPane] == NO) {
- [self displayFindView:mwcFlags.findPaneState animating:NO];
+ [self displayFindViewAnimating:NO];
}
}
@@ -1536,8 +1536,8 @@
#pragma mark Swapping tables
-- (void)displayLeftSideView:(SKLeftSidePaneState)state animating:(BOOL)animate
{
- if (state == SKSidePaneStateThumbnail) {
+- (void)displayLeftSideViewAnimating:(BOOL)animate {
+ if (mwcFlags.leftSidePaneState == SKSidePaneStateThumbnail) {
[leftSideController
replaceSideView:leftSideController.thumbnailTableView.enclosingScrollView
animate:animate];
[self updateThumbnailSelection];
} else {
@@ -1546,8 +1546,8 @@
}
}
-- (void)displayFindView:(SKFindPaneState)state animating:(BOOL)animate {
- if (state == SKFindPaneStateSingular) {
+- (void)displayFindViewAnimating:(BOOL)animate {
+ if (mwcFlags.findPaneState == SKFindPaneStateSingular) {
[leftSideController
replaceSideView:leftSideController.findTableView.enclosingScrollView
animate:animate];
} else {
[leftSideController
replaceSideView:leftSideController.groupedFindTableView.enclosingScrollView
animate:animate];
@@ -1554,8 +1554,8 @@
}
}
-- (void)displayRightSideView:(SKRightSidePaneState)state
animating:(BOOL)animate {
- if (state == SKSidePaneStateNote) {
+- (void)displayRightSideViewAnimating:(BOOL)animate {
+ if (mwcFlags.rightSidePaneState == SKSidePaneStateNote) {
[rightSideController
replaceSideView:rightSideController.noteOutlineView.enclosingScrollView
animate:animate];
} else {
[rightSideController
replaceSideView:rightSideController.snapshotTableView.enclosingScrollView
animate:animate];
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2025-06-18 14:14:19 UTC (rev
15489)
+++ trunk/SKMainWindowController_Actions.m 2025-06-18 14:21:42 UTC (rev
15490)
@@ -822,7 +822,7 @@
if ([searchString length] == 0) {
if ([self displaysFindPane])
- [self displayLeftSideView:mwcFlags.leftSidePaneState
animating:YES];
+ [self displayLeftSideViewAnimating:YES];
[self updateRightStatus];
[self setSearchResults:nil];
@@ -850,7 +850,7 @@
} else {
[pdfDoc beginFindString:[sender stringValue] withOptions:options];
}
- [self displayFindView:mwcFlags.findPaneState animating:YES];
+ [self displayFindViewAnimating:YES];
NSPasteboard *findPboard = [NSPasteboard
pasteboardWithName:NSPasteboardNameFind];
[findPboard clearContents];
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
