Revision: 14111
http://sourceforge.net/p/skim-app/code/14111
Author: hofman
Date: 2024-03-16 17:16:56 +0000 (Sat, 16 Mar 2024)
Log Message:
-----------
Combine side view swapping methods
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2024-03-15 15:18:10 UTC (rev 14110)
+++ trunk/SKMainWindowController.h 2024-03-16 17:16:56 UTC (rev 14111)
@@ -291,12 +291,9 @@
- (void)hideOverviewAnimating:(BOOL)animate;
- (void)hideOverviewAnimating:(BOOL)animate completionHandler:(nullable void
(^)(void))handler;
-- (void)displayTocViewAnimating:(BOOL)animate;
-- (void)displayThumbnailViewAnimating:(BOOL)animate;
-- (void)displayFindViewAnimating:(BOOL)animate;
-- (void)displayGroupedFindViewAnimating:(BOOL)animate;
-- (void)displayNoteViewAnimating:(BOOL)animate;
-- (void)displaySnapshotViewAnimating:(BOOL)animate;
+- (void)displayLeftSideView:(SKLeftSidePaneState)state animating:(BOOL)animate;
+- (void)displayFindView:(SKFindPaneState)state animating:(BOOL)animate;
+- (void)displayRightSideView:(SKRightSidePaneState)state
animating:(BOOL)animate;
- (void)showFindBar;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2024-03-15 15:18:10 UTC (rev 14110)
+++ trunk/SKMainWindowController.m 2024-03-16 17:16:56 UTC (rev 14111)
@@ -323,8 +323,8 @@
[self updateTableFont];
- [self displayThumbnailViewAnimating:NO];
- [self displayNoteViewAnimating:NO];
+ [self displayLeftSideView:SKSidePaneStateThumbnail animating:NO];
+ [self displayRightSideView:SKSidePaneStateNote animating:NO];
// we need to create the PDFView before setting the toolbar
pdfView = [[SKPDFView alloc] initWithFrame:[pdfContentView bounds]];
@@ -1217,10 +1217,7 @@
if (mwcFlags.leftSidePaneState != newLeftSidePaneState || [self
displaysFindPane]) {
mwcFlags.leftSidePaneState = newLeftSidePaneState;
- if (mwcFlags.leftSidePaneState == SKSidePaneStateThumbnail)
- [self displayThumbnailViewAnimating:NO];
- else if (mwcFlags.leftSidePaneState == SKSidePaneStateOutline)
- [self displayTocViewAnimating:NO];
+ [self displayLeftSideView:mwcFlags.leftSidePaneState animating:NO];
}
}
@@ -1238,10 +1235,7 @@
mwcFlags.rightSidePaneState = newRightSidePaneState;
- if (mwcFlags.rightSidePaneState == SKSidePaneStateNote)
- [self displayNoteViewAnimating:NO];
- else if (mwcFlags.rightSidePaneState == SKSidePaneStateSnapshot)
- [self displaySnapshotViewAnimating:NO];
+ [self displayRightSideView:mwcFlags.rightSidePaneState animating:NO];
}
}
@@ -1253,17 +1247,12 @@
if (mwcFlags.findPaneState != newFindPaneState) {
mwcFlags.findPaneState = newFindPaneState;
- if (mwcFlags.findPaneState == SKFindPaneStateSingular)
- [self displayFindViewAnimating:NO];
- else if (mwcFlags.findPaneState == SKFindPaneStateGrouped)
- [self displayGroupedFindViewAnimating:NO];
+ [self displayFindView:mwcFlags.findPaneState animating:NO];
[self updateFindResultHighlightsForDirection:NSDirectSelection];
+
} else if ([self displaysFindPane] == NO) {
- if (mwcFlags.findPaneState == SKFindPaneStateSingular)
- [self displayFindViewAnimating:NO];
- else if (mwcFlags.findPaneState == SKFindPaneStateGrouped)
- [self displayGroupedFindViewAnimating:NO];
+ [self displayFindView:mwcFlags.findPaneState animating:NO];
}
}
@@ -1459,33 +1448,33 @@
#pragma mark Swapping tables
-- (void)displayTocViewAnimating:(BOOL)animate {
- [leftSideController
replaceSideView:leftSideController.tocOutlineView.enclosingScrollView
animate:animate];
- [self updateOutlineSelection];
+- (void)displayLeftSideView:(SKLeftSidePaneState)state animating:(BOOL)animate
{
+ if (state == SKSidePaneStateThumbnail) {
+ [leftSideController
replaceSideView:leftSideController.thumbnailTableView.enclosingScrollView
animate:animate];
+ [self updateThumbnailSelection];
+ } else {
+ [leftSideController
replaceSideView:leftSideController.tocOutlineView.enclosingScrollView
animate:animate];
+ [self updateOutlineSelection];
+ }
}
-- (void)displayThumbnailViewAnimating:(BOOL)animate {
- [leftSideController
replaceSideView:leftSideController.thumbnailTableView.enclosingScrollView
animate:animate];
- [self updateThumbnailSelection];
+- (void)displayFindView:(SKFindPaneState)state animating:(BOOL)animate {
+ if (state == SKFindPaneStateSingular) {
+ [leftSideController
replaceSideView:leftSideController.findTableView.enclosingScrollView
animate:animate];
+ } else {
+ [leftSideController
replaceSideView:leftSideController.groupedFindTableView.enclosingScrollView
animate:animate];
+ }
}
-- (void)displayFindViewAnimating:(BOOL)animate {
- [leftSideController
replaceSideView:leftSideController.findTableView.enclosingScrollView
animate:animate];
+- (void)displayRightSideView:(SKRightSidePaneState)state
animating:(BOOL)animate {
+ if (state == SKSidePaneStateNote) {
+ [rightSideController
replaceSideView:rightSideController.noteOutlineView.enclosingScrollView
animate:animate];
+ } else {
+ [rightSideController
replaceSideView:rightSideController.snapshotTableView.enclosingScrollView
animate:animate];
+ [self updateSnapshotsIfNeeded];
+ }
}
-- (void)displayGroupedFindViewAnimating:(BOOL)animate {
- [leftSideController
replaceSideView:leftSideController.groupedFindTableView.enclosingScrollView
animate:animate];
-}
-
-- (void)displayNoteViewAnimating:(BOOL)animate {
- [rightSideController
replaceSideView:rightSideController.noteOutlineView.enclosingScrollView
animate:animate];
-}
-
-- (void)displaySnapshotViewAnimating:(BOOL)animate {
- [rightSideController
replaceSideView:rightSideController.snapshotTableView.enclosingScrollView
animate:animate];
- [self updateSnapshotsIfNeeded];
-}
-
#pragma mark Overview
- (BOOL)hasOverview {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2024-03-15 15:18:10 UTC (rev
14110)
+++ trunk/SKMainWindowController_Actions.m 2024-03-16 17:16:56 UTC (rev
14111)
@@ -816,12 +816,8 @@
if ([searchString length] == 0) {
- if ([self displaysFindPane]) {
- if (mwcFlags.leftSidePaneState == SKSidePaneStateThumbnail)
- [self displayThumbnailViewAnimating:YES];
- else
- [self displayTocViewAnimating:YES];
- }
+ if ([self displaysFindPane])
+ [self displayLeftSideView:mwcFlags.leftSidePaneState
animating:YES];
[self updateRightStatus];
[self setSearchResults:nil];
@@ -849,10 +845,7 @@
} else {
[pdfDoc beginFindString:[sender stringValue] withOptions:options];
}
- if (mwcFlags.findPaneState == SKFindPaneStateSingular)
- [self displayFindViewAnimating:YES];
- else
- [self displayGroupedFindViewAnimating:YES];
+ [self displayFindView:mwcFlags.findPaneState animating: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
