[Skim-app-commit] SF.net SVN: skim-app:[12663] trunk/SKPDFView.m

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

Revision: 12663
          http://sourceforge.net/p/skim-app/code/12663
Author:   hofman
Date:     2021-12-29 19:59:44 +0000 (Wed, 29 Dec 2021)
Log Message:
-----------
derive whether layer should be added from its class

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2021-12-29 15:28:03 UTC (rev 12662)
+++ trunk/SKPDFView.m   2021-12-29 19:59:44 UTC (rev 12663)
@@ -3304,8 +3304,9 @@
 
 #pragma mark Event handling
 
-- (NSWindow *)newOverlayLayer:(CALayer *)layer wantsAdded:(BOOL)wantsAdded {
+- (NSWindow *)newOverlayLayer:(CALayer *)layer {
     NSWindow *overlay = nil;
+    BOOL wantsAdded = [layer isKindOfClass:[CAShapeLayer class]];
     [layer setContentsScale:[[self layer] contentsScale]];
     if (wantsAdded && [self wantsLayer]) {
         [[self layer] addSublayer:layer];
@@ -4216,7 +4217,7 @@
         }
     }
     
-    overlay = [self newOverlayLayer:layer wantsAdded:YES];
+    overlay = [self newOverlayLayer:layer];
     
     // don't coalesce mouse event from mouse while drawing,
     // but not from tablets because those fire very rapidly and lead to 
serious delays
@@ -4662,7 +4663,7 @@
     [layer setMasksToBounds:YES];
     [layer setZPosition:1.0];
     
-    overlay = [self newOverlayLayer:layer wantsAdded:YES];
+    overlay = [self newOverlayLayer:layer];
     
        while (YES) {
                theEvent = [window nextEventMatchingMask: NSLeftMouseUpMask | 
NSLeftMouseDraggedMask | NSFlagsChangedMask];
@@ -5002,7 +5003,7 @@
                 CGColorRelease(borderColor);
             }
             
-            loupeWindow = [self newOverlayLayer:loupeLayer wantsAdded:NO];
+            loupeWindow = [self newOverlayLayer:loupeLayer];
             [loupeWindow setHasShadow:YES];
             [self updateLoupeBackgroundColor];
             if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKInvertColorsInDarkModeKey])
@@ -5072,7 +5073,7 @@
     [layer setMasksToBounds:YES];
     [layer setZPosition:1.0];
     
-    overlay = [self newOverlayLayer:layer wantsAdded:YES];
+    overlay = [self newOverlayLayer:layer];
     
     while (YES) {
         theEvent = [window nextEventMatchingMask: NSLeftMouseUpMask | 
NSLeftMouseDraggedMask | NSFlagsChangedMask];

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