[Skim-app-commit] SF.net SVN: skim-app:[12453] trunk/NSGraphics_SKExtensions.m

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

Revision: 12453
          http://sourceforge.net/p/skim-app/code/12453
Author:   hofman
Date:     2021-10-04 15:47:30 +0000 (Mon, 04 Oct 2021)
Log Message:
-----------
Build up color effect filters

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

Modified: trunk/NSGraphics_SKExtensions.m
===================================================================
--- trunk/NSGraphics_SKExtensions.m     2021-10-04 14:51:57 UTC (rev 12452)
+++ trunk/NSGraphics_SKExtensions.m     2021-10-04 15:47:30 UTC (rev 12453)
@@ -185,18 +185,13 @@
 #pragma mark -
 
 extern NSArray *SKColorEffectFilters(void) {
+    NSMutableArray *filters = [NSMutableArray array];
     CGFloat sepia = [[NSUserDefaults standardUserDefaults] 
doubleForKey:@"SKSepiaTone"];
-    BOOL invert = SKHasDarkAppearance(NSApp) && [[NSUserDefaults 
standardUserDefaults] boolForKey:SKInvertColorsInDarkModeKey];
-    if (sepia > 0.0) {
-        if (sepia > 1.0)
-            sepia = 1.0;
-        if (invert)
-            return [NSArray arrayWithObjects:[CIFilter 
filterWithName:@"CISepiaTone" keysAndValues:@"inputIntensity", [NSNumber 
numberWithDouble:sepia], nil], [CIFilter filterWithName:@"CIColorInvert"], 
[CIFilter filterWithName:@"CIHueAdjust" keysAndValues:kCIInputAngleKey, 
[NSNumber numberWithDouble:M_PI], nil], nil];
-        else
-            return [NSArray arrayWithObjects:[CIFilter 
filterWithName:@"CISepiaTone" keysAndValues:@"inputIntensity", [NSNumber 
numberWithDouble:sepia], nil], nil];
-    } else if (invert) {
-        return [NSArray arrayWithObjects:[CIFilter 
filterWithName:@"CIColorInvert"], [CIFilter filterWithName:@"CIHueAdjust" 
keysAndValues:kCIInputAngleKey, [NSNumber numberWithDouble:M_PI], nil], nil];
-    } else {
-        return [NSArray array];
+    if (sepia > 0.0)
+        [filters addObject:[CIFilter filterWithName:@"CISepiaTone" 
keysAndValues:@"inputIntensity", [NSNumber numberWithDouble:fmin(sepia, 1.0)], 
nil]];
+    if (SKHasDarkAppearance(NSApp) && [[NSUserDefaults standardUserDefaults] 
boolForKey:SKInvertColorsInDarkModeKey]) {
+        [filters addObject:[CIFilter filterWithName:@"CIColorInvert"]];
+        [filters addObject:[CIFilter filterWithName:@"CIHueAdjust" 
keysAndValues:kCIInputAngleKey, [NSNumber numberWithDouble:M_PI], nil]];
     }
+    return filters;
 }

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