Revision: 10199
http://sourceforge.net/p/skim-app/code/10199
Author: hofman
Date: 2018-12-28 22:15:07 +0000 (Fri, 28 Dec 2018)
Log Message:
-----------
rename ivars and methods for dynamic colors
Modified Paths:
--------------
trunk/NSColor_SKExtensions.h
trunk/NSColor_SKExtensions.m
trunk/PDFView_SKExtensions.m
trunk/SKGradientView.m
trunk/SKImageToolTipContext.m
Modified: trunk/NSColor_SKExtensions.h
===================================================================
--- trunk/NSColor_SKExtensions.h 2018-12-28 16:03:46 UTC (rev 10198)
+++ trunk/NSColor_SKExtensions.h 2018-12-28 22:15:07 UTC (rev 10199)
@@ -71,12 +71,10 @@
@interface NSColor (SKExtensions)
-+ (NSColor *)colorWithLightColor:(NSColor *)aLightColor darkColor:(NSColor
*)aDarkColor;
-+ (NSColor *)colorWithCalibratedLightWhite:(CGFloat)lightWhite
darkWhite:(CGFloat)darkWhite alpha:(CGFloat)alpha;
-+ (NSColor *)colorWithCalibratedLightRed:(CGFloat)lightRed
lightGreen:(CGFloat)lightGreen lightBlue:(CGFloat)lightBlue
darkRed:(CGFloat)darkRed darkGreen:(CGFloat)darkGreen
darkBlue:(CGFloat)darkBlue alpha:(CGFloat)alpha;
++ (NSColor *)colorWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor
*)aDarkAquaColor;
++ (NSColor *)colorWithCalibratedAquaWhite:(CGFloat)lightWhite
alpha:(CGFloat)aquaAlpha darkAquaWhite:(CGFloat)darkWhite
alpha:(CGFloat)darkAquaAlpha;
++ (NSColor *)colorWithCalibratedAquaRed:(CGFloat)lightRed
green:(CGFloat)lightGreen blue:(CGFloat)lightBlue alpha:(CGFloat)aquaAlpha
darkAquaRed:(CGFloat)darkRed green:(CGFloat)darkGreen blue:(CGFloat)darkBlue
alpha:(CGFloat)darkAquaAlpha;
-- (NSColor *)dynamicColorWithMaxDarkBrightness:(CGFloat)maxBrightness;
-
+ (NSColor *)keySourceListHighlightColor;
+ (NSColor *)mainSourceListHighlightColor;
+ (NSColor *)disabledSourceListHighlightColor;
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2018-12-28 16:03:46 UTC (rev 10198)
+++ trunk/NSColor_SKExtensions.m 2018-12-28 22:15:07 UTC (rev 10199)
@@ -41,10 +41,10 @@
#import "NSGraphics_SKExtensions.h"
@interface SKDynamicColor : NSColor {
- NSColor *lightColor;
- NSColor *darkColor;
+ NSColor *aquaColor;
+ NSColor *darkAquaColor;
}
-- (id)initWithLightColor:(NSColor *)aLightColor darkColor:(NSColor
*)aDarkColor;
+- (id)initWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor
*)aDarkAquaColor;
@end
#pragma mark -
@@ -69,29 +69,20 @@
SKAddInstanceMethodImplementationFromSelector(self, @selector(CGColor),
@selector(fallback_CGColor));
}
-+ (NSColor *)colorWithLightColor:(NSColor *)aLightColor darkColor:(NSColor
*)aDarkColor {
++ (NSColor *)colorWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor
*)aDarkAquaColor {
if (RUNNING_AFTER(10_13))
- return [[[SKDynamicColor alloc] initWithLightColor:aLightColor
darkColor:aDarkColor] autorelease];
- return aLightColor;
+ return [[[SKDynamicColor alloc] initWithAquaColor:aAquaColor
darkAquaColor:aDarkAquaColor] autorelease];
+ return aAquaColor;
}
-+ (NSColor *)colorWithCalibratedLightWhite:(CGFloat)lightWhite
darkWhite:(CGFloat)darkWhite alpha:(CGFloat)alpha {
- return [self colorWithLightColor:[NSColor
colorWithCalibratedWhite:lightWhite alpha:alpha] darkColor:[NSColor
colorWithCalibratedWhite:darkWhite alpha:alpha]];
++ (NSColor *)colorWithCalibratedAquaWhite:(CGFloat)lightWhite
alpha:(CGFloat)aquaAlpha darkAquaWhite:(CGFloat)darkWhite
alpha:(CGFloat)darkAquaAlpha {
+ return [self colorWithAquaColor:[NSColor
colorWithCalibratedWhite:lightWhite alpha:aquaAlpha] darkAquaColor:[NSColor
colorWithCalibratedWhite:darkWhite alpha:darkAquaAlpha]];
}
-+ (NSColor *)colorWithCalibratedLightRed:(CGFloat)lightRed
lightGreen:(CGFloat)lightGreen lightBlue:(CGFloat)lightBlue
darkRed:(CGFloat)darkRed darkGreen:(CGFloat)darkGreen
darkBlue:(CGFloat)darkBlue alpha:(CGFloat)alpha {
- return [self colorWithLightColor:[NSColor colorWithCalibratedRed:lightRed
green:lightGreen blue:lightBlue alpha:alpha] darkColor:[NSColor
colorWithCalibratedRed:darkRed green:darkGreen blue:darkBlue alpha:alpha]];
++ (NSColor *)colorWithCalibratedAquaRed:(CGFloat)aquaRed
green:(CGFloat)aquaGreen blue:(CGFloat)aquaBlue alpha:(CGFloat)aquaAlpha
darkAquaRed:(CGFloat)darkAquaRed green:(CGFloat)darkAquaGreen
blue:(CGFloat)darkAquaBlue alpha:(CGFloat)darkAquaAlpha {
+ return [self colorWithAquaColor:[NSColor colorWithCalibratedRed:aquaRed
green:aquaGreen blue:aquaBlue alpha:aquaAlpha] darkAquaColor:[NSColor
colorWithCalibratedRed:darkAquaRed green:darkAquaGreen blue:darkAquaBlue
alpha:darkAquaAlpha]];
}
-- (NSColor *)dynamicColorWithMaxDarkBrightness:(CGFloat)maxBrightness {
- NSColor *lightColor = [self
colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
- CGFloat brightness = [lightColor brightnessComponent];
- if (brightness <= maxBrightness)
- return self;
- NSColor *darkColor = [NSColor colorWithCalibratedHue:[lightColor
hueComponent] saturation:[lightColor saturationComponent]
brightness:maxBrightness alpha:[lightColor alphaComponent]];
- return [NSColor colorWithLightColor:self darkColor:darkColor];
-}
-
+ (NSColor *)keySourceListHighlightColor {
static NSColor *color = nil;
static NSColor *graphiteColor = nil;
@@ -139,7 +130,7 @@
+ (NSColor *)mainSourceListBackgroundColor {
static NSColor *color = nil;
if (color == nil)
- color = [[NSColor colorWithCalibratedLightRed:0.839216
lightGreen:0.866667 lightBlue:0.898039 darkRed:0.211765 darkGreen:0.215686
darkBlue:0.223529 alpha:1.0] retain];
+ color = [[NSColor colorWithCalibratedAquaRed:0.839216 green:0.866667
blue:0.898039 alpha:1.0 darkAquaRed:0.211765 green:0.215686 blue:0.223529
alpha:1.0] retain];
return color;
}
@@ -160,7 +151,7 @@
+ (NSColor *)pdfControlBackgroundColor {
static NSColor *color = nil;
if (color == nil) {
- color = [[NSColor colorWithCalibratedLightWhite:0.95 darkWhite:0.15
alpha:1.0] retain];
+ color = [[NSColor colorWithCalibratedAquaWhite:0.95 alpha:1.0
darkAquaWhite:0.15 alpha:1.0] retain];
}
return color;
}
@@ -319,18 +310,18 @@
#define FORWARD( PROP, TYPE ) - (TYPE)PROP { return [[self effectiveColor]
PROP]; }
-- (id)initWithLightColor:(NSColor *)aLightColor darkColor:(NSColor
*)aDarkColor {
+- (id)initWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor
*)aDarkAquaColor {
self = [super init];
if (self) {
- lightColor = [aLightColor retain];
- darkColor = [aDarkColor retain];
+ aquaColor = [aAquaColor retain];
+ darkAquaColor = [aDarkAquaColor retain];
}
return self;
}
- (void)dealloc {
- SKDESTROY(lightColor);
- SKDESTROY(darkColor);
+ SKDESTROY(aquaColor);
+ SKDESTROY(darkAquaColor);
[super dealloc];
}
@@ -337,19 +328,19 @@
- (BOOL)isEqual:(id)other {
if ([other isMemberOfClass:[self class]] == NO)
return NO;
- return [lightColor isEqual:((SKDynamicColor *)other)->lightColor] &&
[darkColor isEqual:((SKDynamicColor *)other)->darkColor];
+ return [aquaColor isEqual:((SKDynamicColor *)other)->aquaColor] &&
[darkAquaColor isEqual:((SKDynamicColor *)other)->darkAquaColor];
}
- (NSUInteger)hash {
- return [lightColor hash] + 31 * [darkColor hash];
+ return [aquaColor hash] + 31 * [darkAquaColor hash];
}
- (NSString *)description {
- return [NSString stringWithFormat:@"light = %@, dark = %@", lightColor,
darkColor];
+ return [NSString stringWithFormat:@"light = %@, dark = %@", aquaColor,
darkAquaColor];
}
- (NSColor *)effectiveColor {
- return SKHasDarkAppearance(nil) ? darkColor : lightColor;
+ return SKHasDarkAppearance(nil) ? darkAquaColor : aquaColor;
}
- (void)encodeWithCoder:(NSCoder *)aCoder {
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2018-12-28 16:03:46 UTC (rev 10198)
+++ trunk/PDFView_SKExtensions.m 2018-12-28 22:15:07 UTC (rev 10199)
@@ -369,13 +369,13 @@
+ (NSColor *)defaultBackgroundColor {
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKBackgroundColorKey];
NSColor *darkColor = [[NSUserDefaults standardUserDefaults]
colorForKey:SKDarkBackgroundColorKey];
- return darkColor ? [NSColor colorWithLightColor:color darkColor:darkColor]
: color;
+ return darkColor ? [NSColor colorWithAquaColor:color
darkAquaColor:darkColor] : color;
}
+ (NSColor *)defaultFullScreenBackgroundColor {
NSColor *color = [[NSUserDefaults standardUserDefaults]
colorForKey:SKFullScreenBackgroundColorKey];
NSColor *darkColor = [[NSUserDefaults standardUserDefaults]
colorForKey:SKDarkFullScreenBackgroundColorKey];
- return darkColor ? [NSColor colorWithLightColor:color darkColor:darkColor]
: color;
+ return darkColor ? [NSColor colorWithAquaColor:color
darkAquaColor:darkColor] : color;
}
@end
Modified: trunk/SKGradientView.m
===================================================================
--- trunk/SKGradientView.m 2018-12-28 16:03:46 UTC (rev 10198)
+++ trunk/SKGradientView.m 2018-12-28 22:15:07 UTC (rev 10199)
@@ -67,9 +67,9 @@
alternateBackgroundColors = [[NSArray alloc]
initWithObjects:[NSColor colorWithCalibratedWhite:oldDefaultGrays[2]
alpha:1.0], [NSColor colorWithCalibratedWhite:oldDefaultGrays[3] alpha:1.0],
nil];
edgeColor = [[NSColor colorWithDeviceWhite:oldDefaultGrays[4]
alpha:1.0] retain];
} else {
- backgroundColors = [[NSArray alloc] initWithObjects:[NSColor
colorWithCalibratedLightWhite:defaultGrays[0] darkWhite:defaultGrays[5]
alpha:1.0], [NSColor colorWithCalibratedLightWhite:defaultGrays[1]
darkWhite:defaultGrays[6] alpha:1.0], nil];
- alternateBackgroundColors = [[NSArray alloc]
initWithObjects:[NSColor colorWithCalibratedLightWhite:defaultGrays[2]
darkWhite:defaultGrays[7] alpha:1.0], [NSColor
colorWithCalibratedLightWhite:defaultGrays[3] darkWhite:defaultGrays[8]
alpha:1.0], nil];
- edgeColor = [[NSColor
colorWithCalibratedLightWhite:defaultGrays[4] darkWhite:defaultGrays[9]
alpha:1.0] retain];
+ backgroundColors = [[NSArray alloc] initWithObjects:[NSColor
colorWithCalibratedAquaWhite:defaultGrays[0] alpha:1.0
darkAquaWhite:defaultGrays[5] alpha:1.0], [NSColor
colorWithCalibratedAquaWhite:defaultGrays[1] alpha:1.0
darkAquaWhite:defaultGrays[6] alpha:1.0], nil];
+ alternateBackgroundColors = [[NSArray alloc]
initWithObjects:[NSColor colorWithCalibratedAquaWhite:defaultGrays[2] alpha:1.0
darkAquaWhite:defaultGrays[7] alpha:1.0], [NSColor
colorWithCalibratedAquaWhite:defaultGrays[3] alpha:1.0
darkAquaWhite:defaultGrays[8] alpha:1.0], nil];
+ edgeColor = [[NSColor colorWithCalibratedAquaWhite:defaultGrays[4]
alpha:1.0 darkAquaWhite:defaultGrays[9] alpha:1.0] retain];
}
}
return self;
Modified: trunk/SKImageToolTipContext.m
===================================================================
--- trunk/SKImageToolTipContext.m 2018-12-28 16:03:46 UTC (rev 10198)
+++ trunk/SKImageToolTipContext.m 2018-12-28 22:15:07 UTC (rev 10199)
@@ -68,7 +68,7 @@
static NSColor *backgroundColor = nil;
// @@ Dark mode
if (backgroundColor == nil)
- backgroundColor = RUNNING_AFTER(10_9) ? [[NSColor
colorWithCalibratedLightRed:0.95 lightGreen:0.95 lightBlue:0.95 darkRed:0.25
darkGreen:0.25 darkBlue:0.25 alpha:1.0] retain] : [[NSColor
colorWithCalibratedRed:1.0 green:1.0 blue:0.75 alpha:1.0] retain];
+ backgroundColor = RUNNING_AFTER(10_9) ? [[NSColor
colorWithCalibratedAquaRed:0.95 green:0.95 blue:0.95 alpha:1.0 darkAquaRed:0.25
green:0.25 blue:0.25 alpha:1.0] retain] : [[NSColor colorWithCalibratedRed:1.0
green:1.0 blue:0.75 alpha:1.0] retain];
CGFloat width = [[NSUserDefaults standardUserDefaults]
doubleForKey:SKToolTipWidthKey] - 2.0 * TEXT_MARGIN_X;
CGFloat height = [[NSUserDefaults standardUserDefaults]
doubleForKey:SKToolTipHeightKey] - 2.0 * TEXT_MARGIN_Y;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
