Revision: 15946
http://sourceforge.net/p/skim-app/code/15946
Author: hofman
Date: 2026-01-02 17:00:59 +0000 (Fri, 02 Jan 2026)
Log Message:
-----------
pass index rather than view in method to swap side view table, no neeed to
coveering method
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKSideViewController.h
trunk/SKSideViewController.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2026-01-02 10:50:12 UTC (rev 15945)
+++ trunk/SKMainWindowController.h 2026-01-02 17:00:59 UTC (rev 15946)
@@ -284,10 +284,6 @@
- (void)hideOverviewAnimating:(BOOL)animate;
- (void)hideOverviewAnimating:(BOOL)animate completionHandler:(nullable void
(^)(void))handler;
-- (void)displayLeftSideViewAnimating:(BOOL)animate;
-- (void)displayFindViewAnimating:(BOOL)animate;
-- (void)displayRightSideViewAnimating:(BOOL)animate;
-
- (void)showFindBar;
- (void)selectFindResultHighlight:(NSSelectionDirection)direction;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2026-01-02 10:50:12 UTC (rev 15945)
+++ trunk/SKMainWindowController.m 2026-01-02 17:00:59 UTC (rev 15946)
@@ -353,9 +353,9 @@
[self updateTableFont];
- [self displayLeftSideViewAnimating:NO];
- [self displayRightSideViewAnimating:NO];
-
+ [leftSideController displayTableAtIndex:mwcFlags.leftSidePaneState
animate:NO];
+ [rightSideController displayTableAtIndex:mwcFlags.rightSidePaneState
animate:NO];
+
// we need to create the PDFView before setting the toolbar
pdfView = [[SKPDFView alloc] initWithFrame:[pdfContentView bounds]];
[pdfView setTranslatesAutoresizingMaskIntoConstraints:NO];
@@ -1313,7 +1313,7 @@
if (mwcFlags.leftSidePaneState != newLeftSidePaneState || [self
displaysFindPane]) {
mwcFlags.leftSidePaneState = newLeftSidePaneState;
- [self displayLeftSideViewAnimating:NO];
+ [leftSideController displayTableAtIndex:mwcFlags.leftSidePaneState
animate:NO];
}
}
@@ -1331,7 +1331,7 @@
mwcFlags.rightSidePaneState = newRightSidePaneState;
- [self displayRightSideViewAnimating:NO];
+ [rightSideController displayTableAtIndex:mwcFlags.rightSidePaneState
animate:NO];
}
}
@@ -1343,12 +1343,12 @@
if (mwcFlags.findPaneState != newFindPaneState) {
mwcFlags.findPaneState = newFindPaneState;
- [self displayFindViewAnimating:NO];
+ [leftSideController displayTableAtIndex:2 + mwcFlags.findPaneState
animate:NO];
[self updateFindResultHighlightsForDirection:NSDirectSelection];
} else if ([self displaysFindPane] == NO) {
- [self displayFindViewAnimating:NO];
+ [leftSideController displayTableAtIndex:2 + mwcFlags.findPaneState
animate:NO];
}
}
@@ -1551,32 +1551,6 @@
return [noteToolbarController isVisible];
}
-#pragma mark Swapping tables
-
-- (void)displayLeftSideViewAnimating:(BOOL)animate {
- if (mwcFlags.leftSidePaneState == SKSidePaneStateThumbnail) {
- [leftSideController
replaceSideView:leftSideController.thumbnailTableView.enclosingScrollView
animate:animate];
- } else {
- [leftSideController
replaceSideView:leftSideController.tocOutlineView.enclosingScrollView
animate:animate];
- }
-}
-
-- (void)displayFindViewAnimating:(BOOL)animate {
- if (mwcFlags.findPaneState == SKFindPaneStateSingular) {
- [leftSideController
replaceSideView:leftSideController.findTableView.enclosingScrollView
animate:animate];
- } else {
- [leftSideController
replaceSideView:leftSideController.groupedFindTableView.enclosingScrollView
animate:animate];
- }
-}
-
-- (void)displayRightSideViewAnimating:(BOOL)animate {
- if (mwcFlags.rightSidePaneState == SKSidePaneStateNote) {
- [rightSideController
replaceSideView:rightSideController.noteOutlineView.enclosingScrollView
animate:animate];
- } else {
- [rightSideController
replaceSideView:rightSideController.snapshotTableView.enclosingScrollView
animate:animate];
- }
-}
-
#pragma mark Overview
- (BOOL)hasOverview {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2026-01-02 10:50:12 UTC (rev
15945)
+++ trunk/SKMainWindowController_Actions.m 2026-01-02 17:00:59 UTC (rev
15946)
@@ -827,7 +827,7 @@
if ([searchString length] == 0) {
if ([self displaysFindPane])
- [self displayLeftSideViewAnimating:YES];
+ [leftSideController displayTableAtIndex:mwcFlags.leftSidePaneState
animate:YES];
[self updateRightStatus];
[self setSearchResults:nil];
@@ -856,7 +856,7 @@
[pdfDoc beginFindString:[sender stringValue] withOptions:options];
}
if ([self displaysFindPane] == NO)
- [self displayFindViewAnimating:YES];
+ [leftSideController displayTableAtIndex:2 + mwcFlags.findPaneState
animate:YES];
NSPasteboard *findPboard = [NSPasteboard
pasteboardWithName:NSPasteboardNameFind];
[findPboard clearContents];
Modified: trunk/SKSideViewController.h
===================================================================
--- trunk/SKSideViewController.h 2026-01-02 10:50:12 UTC (rev 15945)
+++ trunk/SKSideViewController.h 2026-01-02 17:00:59 UTC (rev 15946)
@@ -66,7 +66,7 @@
- (BOOL)requiresAlternateButtonForView:(NSView *)aView;
-- (void)replaceSideView:(NSView *)newView animate:(BOOL)animate;
+- (void)displayTableAtIndex:(NSUInteger)idx animate:(BOOL)animate;
@end
Modified: trunk/SKSideViewController.m
===================================================================
--- trunk/SKSideViewController.m 2026-01-02 10:50:12 UTC (rev 15945)
+++ trunk/SKSideViewController.m 2026-01-02 17:00:59 UTC (rev 15946)
@@ -84,12 +84,12 @@
return NO;
}
-- (void)replaceSideView:(NSView *)newView animate:(BOOL)animate {
+- (void)displayTableAtIndex:(NSUInteger)idx animate:(BOOL)animate {
+ NSView *newView = [[[self tableViews] objectAtIndex:idx]
enclosingScrollView];
if ([newView superview] != nil)
return;
- if ([NSView shouldShowFadeAnimation] == NO ||
- [currentView window] == nil)
+ if (animate && ([NSView shouldShowFadeAnimation] == NO || [currentView
window] == nil))
animate = NO;
NSView *oldView = currentView;
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
