Revision: 12564
http://sourceforge.net/p/skim-app/code/12564
Author: hofman
Date: 2021-11-17 14:37:10 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
Properly set hasCropped flag
Modified Paths:
--------------
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2021-11-17 10:42:56 UTC (rev 12563)
+++ trunk/SKMainWindowController.m 2021-11-17 14:37:10 UTC (rev 12564)
@@ -2100,8 +2100,8 @@
- (void)handlePageBoundsDidChangeNotification:(NSNotification *)notification {
NSDictionary *info = [notification userInfo];
PDFPage *page = [info objectForKey:SKPDFPagePageKey];
- NSString *action = [info objectForKey:SKPDFPageActionKey];
- BOOL displayChanged = [action isEqualToString:SKPDFPageActionCrop] == NO
|| [pdfView displayBox] == kPDFDisplayBoxCropBox;
+ BOOL isCrop = [[info objectForKey:SKPDFPageActionKey]
isEqualToString:SKPDFPageActionCrop];
+ BOOL displayChanged = isCrop == NO || [pdfView displayBox] ==
kPDFDisplayBoxCropBox;
if (displayChanged)
[pdfView layoutDocumentView];
@@ -2127,7 +2127,8 @@
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKDisplayPageBoundsKey])
[self updateRightStatus];
- mwcFlags.hasCropped = 1;
+ if (isCrop)
+ mwcFlags.hasCropped = 1;
}
- (void)handleDocumentBeginWrite:(NSNotification *)notification {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2021-11-17 10:42:56 UTC (rev
12563)
+++ trunk/SKMainWindowController_Actions.m 2021-11-17 14:37:10 UTC (rev
12564)
@@ -717,6 +717,8 @@
if (hasChanges)
[self cropPagesToRects:rectArray];
+
+ mwcFlags.hasCropped = 0;
}
- (IBAction)autoSelectContent:(id)sender {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2021-11-17 10:42:56 UTC (rev 12563)
+++ trunk/SKMainWindowController_UI.m 2021-11-17 14:37:10 UTC (rev 12564)
@@ -1701,7 +1701,7 @@
} else if (action == @selector(cropAll:) || action == @selector(crop:) ||
action == @selector(autoCropAll:) || action == @selector(smartAutoCropAll:)) {
return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO;
} else if (action == @selector(resetCrop:)) {
- return mwcFlags.hasCropped == 1 && [self interactionMode] !=
SKPresentationMode && [[self pdfDocument] isLocked] == NO;
+ return mwcFlags.hasCropped && [self interactionMode] !=
SKPresentationMode && [[self pdfDocument] isLocked] == NO;
} else if (action == @selector(autoSelectContent:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && [pdfView toolMode]
== SKSelectToolMode;
} else if (action == @selector(takeSnapshot:)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
