Revision: 16041
http://sourceforge.net/p/skim-app/code/16041
Author: hofman
Date: 2026-02-06 17:48:25 +0000 (Fri, 06 Feb 2026)
Log Message:
-----------
rename options enum
Modified Paths:
--------------
trunk/SKMainDocument.m
trunk/SKPDFSynchronizer.h
trunk/SKPDFSynchronizer.m
trunk/SKReadingBar.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2026-02-06 17:29:43 UTC (rev 16040)
+++ trunk/SKMainDocument.m 2026-02-06 17:48:25 UTC (rev 16041)
@@ -1582,12 +1582,12 @@
}
}
-- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOption)options {
+- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOptions)options {
PDFDocument *pdfDoc = [self pdfDocument];
if (pageIndex < [pdfDoc pageCount]) {
- if ((options & SKPDFSynchronizerFlippedMask))
+ if ((options & SKPDFSynchronizerFlipped))
point.y = NSMaxY([[pdfDoc pageAtIndex:pageIndex]
boundsForBox:kPDFDisplayBoxMediaBox]) - point.y;
- [[self pdfView] displayLineAtPoint:point inPageAtIndex:pageIndex
select:(options & SKPDFSynchronizerSelectMask) != 0 showReadingBar:(options &
SKPDFSynchronizerShowReadingBarMask) != 0];
+ [[self pdfView] displayLineAtPoint:point inPageAtIndex:pageIndex
select:(options & SKPDFSynchronizerSelect) != 0 showReadingBar:(options &
SKPDFSynchronizerShowReadingBar) != 0];
}
}
@@ -2066,12 +2066,12 @@
[[self pdfView] goToRect:bounds onPage:page];
} else if ([location isKindOfClass:[NSNumber class]]) {
id source = [args objectForKey:@"Source"];
- NSInteger options = SKPDFSynchronizerDefaultOptions;
+ NSInteger options = SKPDFSynchronizerDefault;
BOOL showBar = [[args objectForKey:@"ShowReadingBar"] boolValue];
if (showBar)
- options |= SKPDFSynchronizerShowReadingBarMask;
+ options |= SKPDFSynchronizerShowReadingBar;
if ([[args objectForKey:@"Selecting"] boolValue] || (showBar == NO &&
[args objectForKey:@"Selecting"] == nil))
- options |= SKPDFSynchronizerSelectMask;
+ options |= SKPDFSynchronizerSelect;
if ([source isKindOfClass:[NSString class]])
source = [NSURL fileURLWithPath:source isDirectory:NO];
else if ([source isKindOfClass:[NSURL class]] == NO)
Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h 2026-02-06 17:29:43 UTC (rev 16040)
+++ trunk/SKPDFSynchronizer.h 2026-02-06 17:48:25 UTC (rev 16041)
@@ -41,11 +41,11 @@
NS_ASSUME_NONNULL_BEGIN
-typedef NS_OPTIONS(NSUInteger, SKPDFSynchronizerOption) {
- SKPDFSynchronizerDefaultOptions = 0,
- SKPDFSynchronizerSelectMask = 1 << 0,
- SKPDFSynchronizerShowReadingBarMask = 1 << 1,
- SKPDFSynchronizerFlippedMask = 1 << 2,
+typedef NS_OPTIONS(NSUInteger, SKPDFSynchronizerOptions) {
+ SKPDFSynchronizerDefault = 0,
+ SKPDFSynchronizerSelect = 1 << 0,
+ SKPDFSynchronizerShowReadingBar = 1 << 1,
+ SKPDFSynchronizerFlipped = 1 << 2,
};
@protocol SKPDFSynchronizerDelegate, SKSyncParser;
@@ -73,7 +73,7 @@
@property (nullable, copy) NSString *fileName;
- (void)findFileAndLineForLocation:(NSPoint)point inRect:(NSRect)rect
pageBounds:(NSRect)bounds atPageIndex:(NSUInteger)pageIndex;
-- (void)findPageAndLocationForLine:(NSInteger)line inFile:(nullable NSString
*)file fromPageIndex:(NSUInteger)pageIndex
options:(SKPDFSynchronizerOption)options;
+- (void)findPageAndLocationForLine:(NSInteger)line inFile:(nullable NSString
*)file fromPageIndex:(NSUInteger)pageIndex
options:(SKPDFSynchronizerOptions)options;
// this must be called to stop the DO server from running in the server thread
- (void)terminate;
@@ -85,7 +85,7 @@
@protocol SKPDFSynchronizerDelegate <NSObject>
- (void)synchronizerFoundLine:(NSInteger)line inFile:(NSString *)file;
-- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOption)options;
+- (void)synchronizerFoundLocation:(NSPoint)point
atPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOptions)options;
@end
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2026-02-06 17:29:43 UTC (rev 16040)
+++ trunk/SKPDFSynchronizer.m 2026-02-06 17:48:25 UTC (rev 16041)
@@ -227,7 +227,7 @@
});
}
-- (void)findPageAndLocationForLine:(NSInteger)line inFile:(NSString *)file
fromPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOption)options {
+- (void)findPageAndLocationForLine:(NSInteger)line inFile:(NSString *)file
fromPageIndex:(NSUInteger)pageIndex options:(SKPDFSynchronizerOptions)options {
if (file == nil)
file = [self defaultSourceFile];
dispatch_async(queue, ^{
@@ -234,7 +234,7 @@
if (file && atomic_load(&shouldKeepRunning) && [self
loadSyncFileIfNeeded]) {
NSUInteger foundPageIndex = pageIndex;
NSPoint foundPoint = NSZeroPoint;
- SKPDFSynchronizerOption foundOptions = options;
+ SKPDFSynchronizerOptions foundOptions = options;
BOOL success = NO;
NSString *fixedFile = [self sourceFileForFileName:file];
NSString *sourceFile = [sourceFileNames objectForKey:fixedFile];
@@ -253,9 +253,9 @@
if (success && atomic_load(&shouldKeepRunning)) {
if (isPdfsync)
- foundOptions &= ~SKPDFSynchronizerFlippedMask;
+ foundOptions &= ~SKPDFSynchronizerFlipped;
else
- foundOptions |= SKPDFSynchronizerFlippedMask;
+ foundOptions |= SKPDFSynchronizerFlipped;
dispatch_async(dispatch_get_main_queue(), ^{
[delegate synchronizerFoundLocation:foundPoint
atPageIndex:foundPageIndex options:foundOptions];
});
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2026-02-06 17:29:43 UTC (rev 16040)
+++ trunk/SKReadingBar.m 2026-02-06 17:48:25 UTC (rev 16041)
@@ -317,9 +317,9 @@
source = [NSURL fileURLWithPath:source isDirectory:NO];
else if ([source isKindOfClass:[NSURL class]] == NO)
source = nil;
- SKPDFSynchronizerOption options = SKPDFSynchronizerShowReadingBarMask;
+ SKPDFSynchronizerOptions options = SKPDFSynchronizerShowReadingBar;
if ([[args objectForKey:@"Selecting"] boolValue])
- options |= SKPDFSynchronizerSelectMask;
+ options |= SKPDFSynchronizerSelect;
[[(SKMainDocument *)[page containingDocument] synchronizer]
findPageAndLocationForLine:[location integerValue] inFile:[source path]
fromPageIndex:[page pageIndex] options:options];
return;
} else {
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
