Revision: 15892
http://sourceforge.net/p/skim-app/code/15892
Author: hofman
Date: 2025-12-20 09:58:59 +0000 (Sat, 20 Dec 2025)
Log Message:
-----------
rename properties to be sure
Modified Paths:
--------------
trunk/SKMainDocument.m
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKMainDocument.m 2025-12-20 09:58:59 UTC (rev 15892)
@@ -1821,7 +1821,7 @@
}
- (NSData *)selectionQDRect {
- Rect qdRect = SKQDRectFromNSRect([[self pdfView] currentSelectionRect]);
+ Rect qdRect = SKQDRectFromNSRect([[self pdfView] selectToolRect]);
return [NSData dataWithBytes:&qdRect length:sizeof(Rect)];
}
@@ -1829,18 +1829,18 @@
if ([inQDRectAsData length] == sizeof(Rect)) {
const Rect *qdBounds = (const Rect *)[inQDRectAsData bytes];
NSRect newBounds = SKNSRectFromQDRect(*qdBounds);
- [[self pdfView] setCurrentSelectionRect:newBounds];
- if ([[self pdfView] currentSelectionPage] == nil)
- [[self pdfView] setCurrentSelectionPage:[[self pdfView]
currentPage]];
+ [[self pdfView] setSelectToolRect:newBounds];
+ if ([[self pdfView] selectToolPage] == nil)
+ [[self pdfView] setSelectToolPage:[[self pdfView] currentPage]];
}
}
- (id)selectionPage {
- return [[self pdfView] currentSelectionPage];
+ return [[self pdfView] selectToolPage];
}
- (void)setSelectionPage:(PDFPage *)page {
- [[self pdfView] setCurrentSelectionPage:[page isKindOfClass:[PDFPage
class]] ? page : nil];
+ [[self pdfView] setSelectToolPage:[page isKindOfClass:[PDFPage class]] ?
page : nil];
}
- (NSArray *)noteSelection {
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKMainToolbarController.m 2025-12-20 09:58:59 UTC (rev 15892)
@@ -1002,7 +1002,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
- return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView
currentSelectionRect]) == NO || [mainController.pdfView toolMode] !=
SKToolModeSelect);
+ return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView
selectToolRect]) == NO || [mainController.pdfView toolMode] !=
SKToolModeSelect);
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier] ||
[identifier
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
[identifier
isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier] ||
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKMainWindowController.m 2025-12-20 09:58:59 UTC (rev 15892)
@@ -686,7 +686,7 @@
#define INCH_PER_POINT 0.013888889
- (void)updateRightStatus {
- NSRect rect = [pdfView currentSelectionRect];
+ NSRect rect = [pdfView selectToolRect];
CGFloat magnification = [pdfView currentMagnification];
NSString *message;
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2025-12-18 10:37:19 UTC (rev
15891)
+++ trunk/SKMainWindowController_Actions.m 2025-12-20 09:58:59 UTC (rev
15892)
@@ -440,7 +440,7 @@
- (IBAction)doZoomToSelection:(id)sender {
if ([pdfView toolMode] == SKToolModeSelect) {
- NSRect selRect = [pdfView currentSelectionRect];
+ NSRect selRect = [pdfView selectToolRect];
PDFPage *page = [pdfView currentPage];
if (NSIsEmptyRect(selRect) == NO && page)
[pdfView zoomToRect:selRect onPage:page];
@@ -575,8 +575,8 @@
}
- (IBAction)crop:(id)sender {
- NSRect rect = NSIntegralRect([pdfView currentSelectionRect]);
- PDFPage *page = [pdfView currentSelectionPage] ?: [pdfView currentPage];
+ NSRect rect = NSIntegralRect([pdfView selectToolRect]);
+ PDFPage *page = [pdfView selectToolPage] ?: [pdfView currentPage];
if (NSIsEmptyRect(rect))
rect = [page autoCropBox];
[self cropPageAtIndex:[page pageIndex] toRect:rect];
@@ -611,7 +611,7 @@
}
- (IBAction)cropAll:(id)sender {
- NSRect rect[2] = {NSIntegralRect([pdfView currentSelectionRect]),
NSZeroRect};
+ NSRect rect[2] = {NSIntegralRect([pdfView selectToolRect]), NSZeroRect};
NSPointerArray *rectArray = [[NSPointerArray alloc] initForRectPointers];
BOOL emptySelection = NSIsEmptyRect(rect[0]);
@@ -654,7 +654,7 @@
}
[self cropPagesToRects:rectArray];
- [pdfView setCurrentSelectionRect:NSZeroRect];
+ [pdfView setSelectToolRect:NSZeroRect];
}
- (IBAction)autoCropAll:(id)sender {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKMainWindowController_UI.m 2025-12-20 09:58:59 UTC (rev 15892)
@@ -1865,7 +1865,7 @@
} else if (action == @selector(doZoomToPhysicalSize:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && ([pdfView
autoScales] || fabs([pdfView physicalScaleFactor] - 1.0 ) > 0.001);
} else if (action == @selector(doZoomToSelection:)) {
- return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO &&
(NSIsEmptyRect([pdfView currentSelectionRect]) == NO || [pdfView toolMode] !=
SKToolModeSelect);
+ return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO &&
(NSIsEmptyRect([pdfView selectToolRect]) == NO || [pdfView toolMode] !=
SKToolModeSelect);
} else if (action == @selector(doZoomToFit:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView
autoScales] == NO;
} else if (action == @selector(alternateZoomToFit:)) {
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKPDFView.h 2025-12-20 09:58:59 UTC (rev 15892)
@@ -188,8 +188,8 @@
@property (nonatomic, nullable, strong) PDFAnnotation *currentAnnotation;
@property (nonatomic, readonly, getter=isEditing) BOOL editing;
@property (nonatomic, readonly, getter=isZooming) BOOL zooming;
-@property (nonatomic) NSRect currentSelectionRect;
-@property (nonatomic, nullable, strong) PDFPage *currentSelectionPage;
+@property (nonatomic) NSRect selectToolRect;
+@property (nonatomic, nullable, strong) PDFPage *selectToolPage;
@property (nonatomic, readonly) CGFloat currentMagnification;
@property (nonatomic) BOOL hideNotes;
@property (nonatomic, readonly) BOOL canSelectNote;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-12-18 10:37:19 UTC (rev 15891)
+++ trunk/SKPDFView.m 2025-12-20 09:58:59 UTC (rev 15892)
@@ -244,7 +244,7 @@
@implementation SKPDFView
@synthesize toolMode, annotationMode, temporaryToolMode, currentAnnotation,
readingBar, pacerSpeed, typeSelectHelper, syncDot, hideNotes, zooming;
-@dynamic extendedDisplayMode, displaysHorizontally, displaySettings,
canSelectNote, hasReadingBar, hasPacer, currentSelectionPage,
currentSelectionRect, currentMagnification, needsRewind, editing, delegate;
+@dynamic extendedDisplayMode, displaysHorizontally, displaySettings,
canSelectNote, hasReadingBar, hasPacer, selectToolPage, selectToolRect,
currentMagnification, needsRewind, editing, delegate;
+ (void)initialize {
SKINITIALIZE;
@@ -633,7 +633,7 @@
}
} else if (toolMode == SKToolModeSelect) {
if (NSEqualRects(selectionRect, NSZeroRect) == NO) {
- [self setCurrentSelectionRect:NSZeroRect];
+ [self setSelectToolRect:NSZeroRect];
[[NSNotificationCenter defaultCenter]
postNotificationName:SKPDFViewSelectionChangedNotification object:self];
}
} else if (toolMode == SKToolModeMagnify) {
@@ -850,13 +850,13 @@
[super setCurrentSelection:selection];
}
-- (NSRect)currentSelectionRect {
+- (NSRect)selectToolRect {
if (toolMode == SKToolModeSelect)
return selectionRect;
return NSZeroRect;
}
-- (void)setCurrentSelectionRect:(NSRect)rect {
+- (void)setSelectToolRect:(NSRect)rect {
if (toolMode == SKToolModeSelect) {
if (NSEqualRects(selectionRect, rect) == NO)
[self setNeedsDisplay:YES];
@@ -873,11 +873,11 @@
}
}
-- (PDFPage *)currentSelectionPage {
+- (PDFPage *)selectToolPage {
return selectionPageIndex == NSNotFound ? nil : [[self document]
pageAtIndex:selectionPageIndex];
}
-- (void)setCurrentSelectionPage:(PDFPage *)page {
+- (void)setSelectToolPage:(PDFPage *)page {
if (toolMode == SKToolModeSelect) {
if (selectionPageIndex != [page pageIndex] || (page == nil &&
selectionPageIndex != NSNotFound))
[self setNeedsDisplay:YES];
@@ -1175,7 +1175,7 @@
if (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
NSRect selRect = NSIntegralRect(selectionRect);
- PDFPage *page = [self currentSelectionPage];
+ PDFPage *page = [self selectToolPage];
NSData *pdfData = nil;
NSData *tiffData = nil;
@@ -2313,7 +2313,7 @@
pdfType = NSPasteboardTypePDF;
else if ([types containsObject:NSPDFPboardType])
pdfType = NSPDFPboardType;
- if (pdfType && (pdfData = [[self currentSelectionPage]
PDFDataForRect:selRect]))
+ if (pdfType && (pdfData = [[self selectToolPage]
PDFDataForRect:selRect]))
[writeTypes addObject:pdfType];
}
if ([types containsObject:NSPasteboardTypeTIFF])
@@ -2320,7 +2320,7 @@
tiffType = NSPasteboardTypeTIFF;
else if ([types containsObject:NSTIFFPboardType])
tiffType = NSTIFFPboardType;
- if (tiffType && (tiffData = [[self currentSelectionPage]
TIFFDataForRect:selRect]))
+ if (tiffType && (tiffData = [[self selectToolPage]
TIFFDataForRect:selRect]))
[writeTypes addObject:tiffType];
if ([writeTypes count] > 0) {
[pboard declareTypes:writeTypes owner:nil];
@@ -3056,7 +3056,7 @@
BOOL autoFits = NO;
if (toolMode == SKToolModeSelect && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
- page = [self currentSelectionPage];
+ page = [self selectToolPage];
rect = NSIntersectionRect(selectionRect, [page
boundsForBox:kPDFDisplayBoxCropBox]);
autoFits = YES;
}
@@ -4408,7 +4408,7 @@
CGFloat margin = HANDLE_SIZE / [self scaleFactor];
if (selectionPageIndex != NSNotFound && [page pageIndex] !=
selectionPageIndex) {
- [self setNeedsDisplayInRect:NSInsetRect(selectionRect, -margin,
-margin) ofPage:[self currentSelectionPage]];
+ [self setNeedsDisplayInRect:NSInsetRect(selectionRect, -margin,
-margin) ofPage:[self selectToolPage]];
[self setNeedsDisplayInRect:NSInsetRect(selectionRect, -margin,
-margin) ofPage:page];
}
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
