[Skim-app-commit] SF.net SVN: skim-app:[12902] trunk/SKTopBarView.m

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

Revision: 12902
          http://sourceforge.net/p/skim-app/code/12902
Author:   hofman
Date:     2022-05-09 09:20:21 +0000 (Mon, 09 May 2022)
Log Message:
-----------
combine settings of material

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

Modified: trunk/SKTopBarView.m
===================================================================
--- trunk/SKTopBarView.m        2022-05-08 21:36:01 UTC (rev 12901)
+++ trunk/SKTopBarView.m        2022-05-09 09:20:21 UTC (rev 12902)
@@ -125,18 +125,14 @@
 - (void)setStyle:(SKTopBarStyle)newStyle {
     style = newStyle;
     NSColor *sepColor = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
     switch (style) {
         case SKTopBarStyleDefault:
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
             [blurView setMaterial:RUNNING_AFTER(10_15) || 
RUNNING_BEFORE(10_13) ? NSVisualEffectMaterialTitlebar : 
NSVisualEffectMaterialHeaderView];
-#pragma clang diagnostic pop
             [blurView setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
             if (RUNNING_AFTER(10_13)) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
                 sepColor = [NSColor separatorColor];
-#pragma clang diagnostic pop
             } else{
                 [backgroundView setBackgroundColor:[NSColor 
colorWithGenericGamma22White:1.0 alpha:0.25]];
                 sepColor = [NSColor colorWithGenericGamma22White:0.8 
alpha:0.35];
@@ -143,24 +139,15 @@
             }
             break;
         case SKTopBarStylePDFControlBackground:
-            if (RUNNING_AFTER(10_13)) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
-                [blurView setMaterial:RUNNING_AFTER(10_15) || 
RUNNING_BEFORE(10_13) ? NSVisualEffectMaterialTitlebar : 
NSVisualEffectMaterialHeaderView];
-#pragma clang diagnostic pop
-                [blurView 
setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
-            } else {
-                [blurView setMaterial:NSVisualEffectMaterialLight];
-                [blurView 
setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
+            [blurView setMaterial:RUNNING_AFTER(10_15) ? 
NSVisualEffectMaterialTitlebar : RUNNING_AFTER(10_13) ? 
NSVisualEffectMaterialHeaderView : NSVisualEffectMaterialLight];
+            [blurView setBlendingMode:NSVisualEffectBlendingModeWithinWindow];
+            if (RUNNING_BEFORE(10_14)) {
                 [backgroundView setBackgroundColor:[NSColor 
colorWithGenericGamma22White:0.98 alpha:0.5]];
             }
             break;
         case SKTopBarStylePresentation:
             if (RUNNING_AFTER(10_13)) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpartial-availability"
                 [blurView setMaterial:NSVisualEffectMaterialSidebar];
-#pragma clang diagnostic pop
                 [blurView 
setBlendingMode:NSVisualEffectBlendingModeBehindWindow];
             } else {
                 [backgroundView setBackgroundColor:[NSColor 
windowBackgroundColor]];
@@ -167,6 +154,7 @@
             }
             break;
     }
+#pragma clang diagnostic pop
     [backgroundView setSeparatorColor:sepColor];
     [backgroundView setNeedsDisplay:YES];
 }

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