Revision: 24150
http://sourceforge.net/p/bibdesk/svn/24150
Author: hofman
Date: 2019-08-19 22:24:35 +0000 (Mon, 19 Aug 2019)
Log Message:
-----------
use dynamic colors after 10.13
Modified Paths:
--------------
trunk/bibdesk/NSColor_BDSKExtensions.m
Modified: trunk/bibdesk/NSColor_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSColor_BDSKExtensions.m 2019-08-19 06:31:05 UTC (rev
24149)
+++ trunk/bibdesk/NSColor_BDSKExtensions.m 2019-08-19 22:24:35 UTC (rev
24150)
@@ -215,12 +215,12 @@
NSUInteger i = isSelected ? 1 : 0;
if (colors[i] == nil) {
NSColor *color = isSelected ? [NSColor
alternateSelectedControlTextColor] : [NSColor controlTextColor];
- if (RUNNING_BEFORE(10_13))
- colors[i] = [[color colorWithAlphaComponent:0.6 * [color
alphaComponent]] retain];
- else
+ if (RUNNING_AFTER(10_13))
colors[i] = [[BDSKGeneratedDynamicColor alloc]
initWithColorGenerator:^{
return [color colorWithAlphaComponent:0.6 * [color
alphaComponent]];
}];
+ else
+ colors[i] = [[color colorWithAlphaComponent:0.6 * [color
alphaComponent]] retain];
}
return colors[i];
}
@@ -240,10 +240,10 @@
color = [color colorWithAlphaComponent:0.6];
return color;
};
- if (RUNNING_BEFORE(10_13))
+ if (RUNNING_AFTER(10_13))
+ colors[i] = [[BDSKGeneratedDynamicColor alloc]
initWithColorGenerator:generator];
+ else
colors[i] = [generator() retain];
- else
- colors[i] = [[BDSKGeneratedDynamicColor alloc]
initWithColorGenerator:generator];
}
}
return colors[i];
@@ -252,12 +252,12 @@
+ (NSColor *)searchHighlightColor {
static NSColor *color = nil;
if (color == nil) {
- if (RUNNING_BEFORE(10_13))
- color = [[[NSColor systemYellowColor]
colorWithAlphaComponent:0.33333] retain];
- else
+ if (RUNNING_AFTER(10_13))
color = [[BDSKGeneratedDynamicColor alloc]
initWithColorGenerator:^{
return [[NSColor systemYellowColor]
colorWithAlphaComponent:0.33333];
}];
+ else
+ color = [[[NSColor systemYellowColor]
colorWithAlphaComponent:0.33333] retain];
}
return color;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
