[Skim-app-commit] SF.net SVN: skim-app:[12414] trunk/SKMainWindowController_Actions.m

[hofman--- via Skim-app-commit]

Revision: 12414
          http://sourceforge.net/p/skim-app/code/12414
Author:   hofman
Date:     2021-09-18 18:19:54 +0000 (Sat, 18 Sep 2021)
Log Message:
-----------
Apply crop after removing progress sheet, otherwise rewinding fails

Modified Paths:
--------------
    trunk/SKMainWindowController_Actions.m

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2021-09-18 17:53:40 UTC (rev 
12413)
+++ trunk/SKMainWindowController_Actions.m      2021-09-18 18:19:54 UTC (rev 
12414)
@@ -629,6 +629,8 @@
             rect[j] = NSMakeRect(floor(NSMidX(rect[j]) - 0.5 * w), 
floor(NSMidY(rect[j]) - 0.5 * h), w, h);
         [rectArray addPointer:rect];
         [rectArray addPointer:rect + 1];
+        
+        [self dismissProgressSheet];
     } else {
         [rectArray addPointer:rect];
     }
@@ -635,9 +637,6 @@
     
     [self cropPagesToRects:rectArray];
     [pdfView setCurrentSelectionRect:NSZeroRect];
-       
-    if (emptySelection)
-        [self dismissProgressSheet];
 }
 
 - (IBAction)autoCropAll:(id)sender {
@@ -654,9 +653,10 @@
         if (i && i % 10 == 0)
             [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode 
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     }
+    
+    [self dismissProgressSheet];
+    
     [self cropPagesToRects:rectArray];
-       
-    [self dismissProgressSheet];
 }
 
 - (IBAction)smartAutoCropAll:(id)sender {
@@ -693,9 +693,10 @@
         }
     }
     [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode 
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-    [self cropPagesToRects:rectArray];
        
     [self dismissProgressSheet];
+    
+    [self cropPagesToRects:rectArray];
 }
 
 - (IBAction)resetCrop:(id)sender {
@@ -704,8 +705,6 @@
     PDFDocument *pdfDoc = [pdfView document];
     NSInteger i, iMax = [[pdfView document] pageCount];
     
-    [self beginProgressSheetWithMessage:[NSLocalizedString(@"Cropping Pages", 
@"Message for progress sheet") stringByAppendingEllipsis] maxValue:iMax];
-    
     for (i = 0; i < iMax; i++) {
         PDFPage *page = [pdfDoc pageAtIndex:i] ;
         NSRect rect = NSRectFromCGRect(CGPDFPageGetBoxRect([page pageRef], 
kCGPDFCropBox));
@@ -712,14 +711,13 @@
         if (hasChanges == NO && NSEqualRects(rect, [page 
boundsForBox:kPDFDisplayBoxCropBox]) == NO)
             hasChanges = YES;
         [rectArray addPointer:&rect];
-        [self incrementProgressSheet];
+        //[self incrementProgressSheet];
         if (i && i % 10 == 0)
             [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode 
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
     }
+    
     if (hasChanges)
         [self cropPagesToRects:rectArray];
-    
-    [self dismissProgressSheet];
 }
 
 - (IBAction)autoSelectContent:(id)sender {

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