[Skim-app-commit] SF.net SVN: skim-app:[16281] trunk/SKPresentationView.m

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

Revision: 16281
          http://sourceforge.net/p/skim-app/code/16281
Author:   hofman
Date:     2026-05-11 14:38:05 +0000 (Mon, 11 May 2026)
Log Message:
-----------
avoid early returns

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

Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m  2026-05-10 21:52:59 UTC (rev 16280)
+++ trunk/SKPresentationView.m  2026-05-11 14:38:05 UTC (rev 16281)
@@ -329,44 +329,38 @@
 }
 
 - (void)displayCurrentPage:(void (^)(void))completionHandler {
-    if (page == nil) {
-        if (completionHandler)
-            completionHandler();
-        return;
+    if (page) {
+        NSUInteger pageIndex = [page pageIndex];
+        NSImage *predrawnImage = [self predrawnImageAtIndex:pageIndex];
+        
+        if (predrawnImage) {
+            [pageLayer setContents:predrawnImage];
+            [self removePredrawnImageAtIndex:pageIndex];
+        } else {
+            
+            dispatch_block_t imageGenerator = [self imageGeneratorForPage:page 
handler:^(NSImage *image){
+                if (page && pageIndex == [page pageIndex])
+                    [pageLayer setContents:image];
+                if (completionHandler)
+                    completionHandler();
+            }];
+            
+            if (imageGenerator) {
+                
+                static dispatch_queue_t drawingQueue = nil;
+                if (drawingQueue == nil) {
+                    dispatch_queue_attr_t queuePriority = 
dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, 
QOS_CLASS_UTILITY, 0);
+                    drawingQueue = 
dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.drawing", 
queuePriority);
+                }
+                
+                dispatch_async(drawingQueue, imageGenerator);
+                return;
+            }
+        }
     }
     
-    NSUInteger pageIndex = [page pageIndex];
-    NSImage *predrawnImage = [self predrawnImageAtIndex:pageIndex];
-    
-    if (predrawnImage) {
-        [pageLayer setContents:predrawnImage];
-        [self removePredrawnImageAtIndex:pageIndex];
-        if (completionHandler)
-            completionHandler();
-        return;
-    }
-    
-    dispatch_block_t imageGenerator = [self imageGeneratorForPage:page 
handler:^(NSImage *image){
-        if (page && pageIndex == [page pageIndex])
-            [pageLayer setContents:image];
-        if (completionHandler)
-            completionHandler();
-    }];
-    
-    if (imageGenerator == nil) {
-        if (completionHandler)
-            completionHandler();
-        return;
-    }
-    
-    static dispatch_queue_t drawingQueue = nil;
-    if (drawingQueue == nil) {
-        dispatch_queue_attr_t queuePriority = 
dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_CONCURRENT, 
QOS_CLASS_UTILITY, 0);
-        drawingQueue = 
dispatch_queue_create("net.sourceforge.skim-app.skim.pageview.drawing", 
queuePriority);
-    }
-    
-    dispatch_async(drawingQueue, imageGenerator);
-    
+    if (completionHandler)
+        completionHandler();
 }
 
 - (void)redisplayAtCurrentScaleFactorIfNeeded {

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