Revision: 12159
http://sourceforge.net/p/skim-app/code/12159
Author: hofman
Date: 2021-03-02 17:42:34 +0000 (Tue, 02 Mar 2021)
Log Message:
-----------
Convert colors to sRGB and gamma 2.2 rather than transferring components
Modified Paths:
--------------
trunk/NSColor_SKExtensions.m
trunk/NSImage_SKExtensions.m
trunk/SKBookmark.m
trunk/SKImageToolTipContext.m
trunk/SKImageToolTipWindow.m
trunk/SKThumbnailView.m
trunk/SKTopBarView.m
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/NSColor_SKExtensions.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -112,7 +112,7 @@
+ (NSColor *)pdfControlBackgroundColor {
static NSColor *color = nil;
if (color == nil) {
- color = [[NSColor colorWithGenericGamma22White:0.95 alpha:0.95]
retain];
+ color = [[NSColor colorWithGenericGamma22White:0.96 alpha:0.95]
retain];
}
return color;
}
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/NSImage_SKExtensions.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -1202,7 +1202,7 @@
MAKE_IMAGE(SKImageNameNotesPreferences, NO, 32.0, 32.0,
NSImage *clippingImage = [[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kClippingTextType)];
- NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithSRGBRed:1.0 green:0.935 blue:0.422
alpha:1.0] endingColor:[NSColor colorWithSRGBRed:1.0 green:0.975 blue:0.768
alpha:1.0]] autorelease];
+ NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithSRGBRed:1.0 green:0.939 blue:0.495
alpha:1.0] endingColor:[NSColor colorWithSRGBRed:1.0 green:0.976 blue:0.810
alpha:1.0]] autorelease];
[[NSColor blackColor] setFill];
[NSBezierPath fillRect:NSMakeRect(2.0, 0.0, 28.0, 32.0)];
[clippingImage drawInRect:NSMakeRect(2.0, 0.0, 28.0, 32.0)
fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
@@ -1214,7 +1214,7 @@
MAKE_IMAGE(SKImageNameSyncPreferences, NO, 32.0, 32.0,
NSImage *refreshImage = [NSImage
imageNamed:NSImageNameRefreshTemplate];
NSImage *genericDocImage = [[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kGenericDocumentIcon)];
- [[NSColor colorWithSRGBRed:0.25 green:0.35 blue:0.6 alpha:1.0] set];
+ [[NSColor colorWithSRGBRed:0.3 green:0.45 blue:0.65 alpha:1.0] set];
NSRectFill(NSMakeRect(11.0, 10.0, 10.0, 12.0));
[refreshImage drawInRect:NSMakeRect(11.0, 10.0, 10.0, 12.0)
fromRect:NSZeroRect operation:NSCompositeDestinationAtop fraction:1.0];
[genericDocImage drawInRect:NSMakeRect(0.0, 0.0, 32.0, 32.0)
fromRect:NSZeroRect operation:NSCompositeDestinationOver fraction:1.0];
@@ -1226,14 +1226,14 @@
);
MAKE_IMAGE(SKImageNameNewSeparator, NO, 32.0, 32.0,
- NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithGenericGamma22White:0.6 alpha:1.0]
endingColor:[NSColor colorWithGenericGamma22White:0.8 alpha:1.0]] autorelease];
+ NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithGenericGamma22White:0.65 alpha:1.0]
endingColor:[NSColor colorWithGenericGamma22White:0.85 alpha:1.0]] autorelease];
NSBezierPath *path;
[NSGraphicsContext saveGraphicsState];
[NSShadow setShadowWithWhite:0.0 alpha:0.5 blurRadius:2.0
yOffset:-1.0];
- [[NSColor colorWithGenericGamma22White:0.35 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:0.4 alpha:1.0] setFill];
[NSBezierPath fillRect:NSMakeRect(2.0, 14.0, 28.0, 4.0)];
[NSGraphicsContext restoreGraphicsState];
- [[NSColor colorWithGenericGamma22White:0.45 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:0.5 alpha:1.0] setFill];
[NSBezierPath fillRect:NSMakeRect(3.0, 15.0, 26.0, 3.0)];
[gradient drawInRect:NSMakeRect(3.0, 15.0, 26.0, 2.0) angle:90.0];
path = [NSBezierPath bezierPath];
@@ -2077,7 +2077,7 @@
[[NSColor colorWithGenericGamma22White:1.0 alpha:1.0] setFill];
[path fill];
[NSShadow setShadowWithWhite:0.0 alpha:0.5 blurRadius:1.0 yOffset:0.0];
- [[NSColor colorWithSRGBRed:0.257 green:0.351 blue:0.553 alpha:1.0]
setStroke];
+ [[NSColor colorWithSRGBRed:0.323 green:0.433 blue:0.433 alpha:1.0]
setStroke];
[path stroke];
[NSGraphicsContext restoreGraphicsState];
}
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/SKBookmark.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -815,13 +815,13 @@
[NSShadow setShadowWithWhite:0.0 alpha:0.33333 blurRadius:2.0
yOffset:-1.0];
[path fill];
[NSGraphicsContext restoreGraphicsState];
- [[NSColor colorWithSRGBRed:0.162 green:0.304 blue:0.755 alpha:1.0]
set];
+ [[NSColor colorWithSRGBRed:0.210 green:0.398 blue:0.801 alpha:1.0]
set];
NSRectFill(NSMakeRect(2.0, 13.0, 5.0, 2.0));
- [[NSColor colorWithSRGBRed:0.894 green:0.396 blue:0.202 alpha:1.0]
set];
+ [[NSColor colorWithSRGBRed:0.923 green:0.481 blue:0.259 alpha:1.0]
set];
NSRectFill(NSMakeRect(3.0, 4.0, 1.0, 1.0));
NSRectFill(NSMakeRect(3.0, 7.0, 1.0, 1.0));
NSRectFill(NSMakeRect(3.0, 10.0, 1.0, 1.0));
- [[NSColor colorWithGenericGamma22White:0.6 alpha:1.0] set];
+ [[NSColor colorWithGenericGamma22White:0.65 alpha:1.0] set];
NSRectFill(NSMakeRect(5.0, 4.0, 1.0, 1.0));
NSRectFill(NSMakeRect(5.0, 7.0, 1.0, 1.0));
NSRectFill(NSMakeRect(5.0, 10.0, 1.0, 1.0));
@@ -828,7 +828,7 @@
NSUInteger i, j;
for (i = 0; i < 7; i++) {
for (j = 0; j < 3; j++) {
- [[NSColor colorWithGenericGamma22White:0.45 + 0.1 * rand()
/ RAND_MAX alpha:1.0] set];
+ [[NSColor colorWithGenericGamma22White:0.5 + 0.1 * rand()
/ RAND_MAX alpha:1.0] set];
NSRectFill(NSMakeRect(6.0 + i, 4.0 + 3.0 * j, 1.0, 1.0));
}
}
Modified: trunk/SKImageToolTipContext.m
===================================================================
--- trunk/SKImageToolTipContext.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/SKImageToolTipContext.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -102,7 +102,7 @@
if (labelAttributes == nil)
labelAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:[NSFont
boldSystemFontOfSize:11.0], NSFontAttributeName, [NSColor whiteColor],
NSForegroundColorAttributeName, [NSParagraphStyle
defaultClippingParagraphStyle], NSParagraphStyleAttributeName, nil];
if (labelColor == nil)
- labelColor = [[NSColor colorWithGenericGamma22White:0.5 alpha:0.8]
retain];
+ labelColor = [[NSColor colorWithGenericGamma22White:0.55 alpha:0.8]
retain];
BOOL isScaled = fabs(scale - 1.0) > 0.01;
PDFPage *page = [self page];
Modified: trunk/SKImageToolTipWindow.m
===================================================================
--- trunk/SKImageToolTipWindow.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/SKImageToolTipWindow.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -128,7 +128,7 @@
} else {
static NSColor *backgroundColor = nil;
if (backgroundColor == nil)
- backgroundColor = [[NSColor colorWithSRGBRed:0.95 green:0.95
blue:0.95 alpha:1.0] retain];
+ backgroundColor = [[NSColor colorWithGenericGamma22White:0.97
alpha:1.0] retain];
[self setBackgroundColor:backgroundColor];
}
Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/SKThumbnailView.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -216,7 +216,7 @@
NSRect rect = [self markRect];
if (NSIntersectsRect(dirtyRect, rect)) {
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithSRGBRed:0.581 green:0.088 blue:0.319 alpha:1.0]
setFill];
+ [[NSColor colorWithSRGBRed:0.654 green:0.166 blue:0.392 alpha:1.0]
setFill];
NSBezierPath *path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(NSMinX(rect), NSMinY(rect))];
[path lineToPoint:NSMakePoint(NSMidX(rect), NSMinY(rect) + 0.5 *
NSWidth(rect))];
Modified: trunk/SKTopBarView.m
===================================================================
--- trunk/SKTopBarView.m 2021-03-02 16:50:36 UTC (rev 12158)
+++ trunk/SKTopBarView.m 2021-03-02 17:42:34 UTC (rev 12159)
@@ -83,7 +83,7 @@
[backgroundView setFrame:[self interiorRect]];
[super addSubview:backgroundView];
} else {
- static CGFloat defaultGrays[5] = {0.85, 0.9, 0.9, 0.95, 0.75};
+ static CGFloat defaultGrays[5] = {0.85, 0.9, 0.9, 0.95, 0.8};
backgroundColors = [[NSArray alloc] initWithObjects:[NSColor
colorWithGenericGamma22White:defaultGrays[0] alpha:1.0], [NSColor
colorWithGenericGamma22White:defaultGrays[1] alpha:1.0], nil];
alternateBackgroundColors = [[NSArray alloc]
initWithObjects:[NSColor colorWithGenericGamma22White:defaultGrays[2]
alpha:1.0], [NSColor colorWithGenericGamma22White:defaultGrays[3] alpha:1.0],
nil];
separatorColor = [[NSColor
colorWithGenericGamma22White:defaultGrays[4] alpha:1.0] retain];
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
