Revision: 12154
http://sourceforge.net/p/skim-app/code/12154
Author: hofman
Date: 2021-03-01 16:17:35 +0000 (Mon, 01 Mar 2021)
Log Message:
-----------
Use sRGB and gamma22 instead of calibrated colors
Modified Paths:
--------------
trunk/NSColor_SKExtensions.m
trunk/NSImage_SKExtensions.m
trunk/NSShadow_SKExtensions.m
trunk/NSUserDefaults_SKExtensions.m
trunk/PDFAnnotationInk_SKExtensions.m
trunk/SKApplicationController.m
trunk/SKBookmark.m
trunk/SKColorCell.m
trunk/SKColorSwatch.m
trunk/SKDisplayPreferences.m
trunk/SKImageToolTipContext.m
trunk/SKImageToolTipWindow.m
trunk/SKLineInspector.m
trunk/SKNoteTableRowView.m
trunk/SKPDFView.m
trunk/SKThumbnailView.m
trunk/SKTopBarView.m
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/NSColor_SKExtensions.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -161,7 +161,7 @@
+ (NSColor *)pdfControlBackgroundColor {
static NSColor *color = nil;
if (color == nil) {
- color = [[NSColor colorWithCalibratedWhite:0.95 alpha:0.95] retain];
+ color = [[NSColor colorWithGenericGamma22White:0.95 alpha:0.95]
retain];
}
return color;
}
@@ -174,7 +174,7 @@
#pragma mark Convenience
- (uint32_t)uint32HSBAValue {
- NSColor *rgbColor = [self
colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ NSColor *rgbColor = [self colorUsingColorSpace:[NSColorSpace
sRGBColorSpace]];
if (rgbColor) {
CGFloat h = 0.0, s = 0.0, b = 0.0, a = 0.0;
[rgbColor getHue:&h saturation:&s brightness:&b alpha:&a];
@@ -221,7 +221,7 @@
[path setLineWidth:2.0];
[path addClip];
[self drawSwatchInRect:rect];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.3] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.3] setStroke];
[path stroke];
}
@@ -260,21 +260,21 @@
case SKScriptingColorYellow: return [NSColor yellowColor];
case SKScriptingColorMagenta: return [NSColor magentaColor];
case SKScriptingColorCyan: return [NSColor cyanColor];
- case SKScriptingColorDarkRed: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:0.0 alpha:1.0];
- case SKScriptingColorDarkGreen: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:0.0 alpha:1.0];
- case SKScriptingColorDarkBlue: return [NSColor
colorWithCalibratedRed:0.0 green:0.0 blue:0.5 alpha:1.0];
- case SKScriptingColorBanana: return [NSColor
colorWithCalibratedRed:1.0 green:1.0 blue:0.5 alpha:1.0];
- case SKScriptingColorTurquoise: return [NSColor
colorWithCalibratedRed:1.0 green:0.5 blue:1.0 alpha:1.0];
- case SKScriptingColorViolet: return [NSColor
colorWithCalibratedRed:0.5 green:1.0 blue:1.0 alpha:1.0];
+ case SKScriptingColorDarkRed: return [NSColor colorWithSRGBRed:0.5
green:0.0 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkGreen: return [NSColor
colorWithSRGBRed:0.0 green:0.5 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkBlue: return [NSColor
colorWithSRGBRed:0.0 green:0.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorBanana: return [NSColor colorWithSRGBRed:1.0
green:1.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorTurquoise: return [NSColor
colorWithSRGBRed:1.0 green:0.5 blue:1.0 alpha:1.0];
+ case SKScriptingColorViolet: return [NSColor colorWithSRGBRed:0.5
green:1.0 blue:1.0 alpha:1.0];
case SKScriptingColorOrange: return [NSColor orangeColor];
- case SKScriptingColorDeepPink: return [NSColor
colorWithCalibratedRed:1.0 green:0.0 blue:0.5 alpha:1.0];
- case SKScriptingColorSpringGreen: return [NSColor
colorWithCalibratedRed:0.0 green:1.0 blue:0.5 alpha:1.0];
- case SKScriptingColorAqua: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:1.0 alpha:1.0];
- case SKScriptingColorLime: return [NSColor
colorWithCalibratedRed:0.5 green:1.0 blue:0.0 alpha:1.0];
- case SKScriptingColorDarkViolet: return [NSColor
colorWithCalibratedRed:0.5 green:0.0 blue:1.0 alpha:1.0];
+ case SKScriptingColorDeepPink: return [NSColor
colorWithSRGBRed:1.0 green:0.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorSpringGreen: return [NSColor
colorWithSRGBRed:0.0 green:1.0 blue:0.5 alpha:1.0];
+ case SKScriptingColorAqua: return [NSColor colorWithSRGBRed:0.0
green:0.5 blue:1.0 alpha:1.0];
+ case SKScriptingColorLime: return [NSColor colorWithSRGBRed:0.5
green:1.0 blue:0.0 alpha:1.0];
+ case SKScriptingColorDarkViolet: return [NSColor
colorWithSRGBRed:0.5 green:0.0 blue:1.0 alpha:1.0];
case SKScriptingColorPurple: return [NSColor purpleColor];
- case SKScriptingColorTeal: return [NSColor
colorWithCalibratedRed:0.0 green:0.5 blue:0.5 alpha:1.0];
- case SKScriptingColorOlive: return [NSColor
colorWithCalibratedRed:0.5 green:0.5 blue:0.0 alpha:1.0];
+ case SKScriptingColorTeal: return [NSColor colorWithSRGBRed:0.0
green:0.5 blue:0.5 alpha:1.0];
+ case SKScriptingColorOlive: return [NSColor colorWithSRGBRed:0.5
green:0.5 blue:0.0 alpha:1.0];
case SKScriptingColorBrown: return [NSColor brownColor];
case SKScriptingColorBlack: return [NSColor blackColor];
case SKScriptingColorWhite: return [NSColor whiteColor];
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/NSImage_SKExtensions.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -714,7 +714,7 @@
[path lineToPoint:NSMakePoint(11.5, 14.0)];
[path stroke];
path = [NSBezierPath bezierPath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.5] set];
[path moveToPoint:NSMakePoint(8.0, 8.5)];
[path lineToPoint:NSMakePoint(10.0, 8.5)];
[path moveToPoint:NSMakePoint(8.0, 10.5)];
@@ -731,7 +731,7 @@
[path lineToPoint:NSMakePoint(15.5, 14.0)];
[path stroke];
path = [NSBezierPath bezierPath];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] set];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.5] set];
[path moveToPoint:NSMakePoint(17.0, 8.5)];
[path lineToPoint:NSMakePoint(19.0, 8.5)];
[path moveToPoint:NSMakePoint(17.0, 10.5)];
@@ -854,7 +854,7 @@
);
MAKE_IMAGE(SKImageNameToolbarInfo, YES, 27.0, 20.0,
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.8] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.8] setFill];
NSFont *font = [NSFont fontWithName:@"Hoefler Text Black Italic"
size:13.0] ?: [NSFont boldSystemFontOfSize:13.0];
NSGlyph glyph = [font glyphWithName:@"i"];
NSBezierPath *path = [NSBezierPath
bezierPathWithOvalInRect:NSMakeRect(5.5, 2.5, 16.0, 16.0)];
@@ -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 colorWithCalibratedRed:1.0 green:0.935
blue:0.422 alpha:1.0] endingColor:[NSColor colorWithCalibratedRed:1.0
green:0.975 blue:0.768 alpha:1.0]] autorelease];
+ 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];
[[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 colorWithCalibratedRed:0.25 green:0.35 blue:0.6 alpha:1.0]
set];
+ [[NSColor colorWithSRGBRed:0.25 green:0.35 blue:0.6 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 colorWithCalibratedWhite:0.6 alpha:1.0]
endingColor:[NSColor colorWithCalibratedWhite:0.8 alpha:1.0]] autorelease];
+ NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithGenericGamma22White:0.6 alpha:1.0]
endingColor:[NSColor colorWithGenericGamma22White:0.8 alpha:1.0]] autorelease];
NSBezierPath *path;
[NSGraphicsContext saveGraphicsState];
[NSShadow setShadowWithWhite:0.0 alpha:0.5 blurRadius:2.0
yOffset:-1.0];
- [[NSColor colorWithCalibratedWhite:0.35 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:0.35 alpha:1.0] setFill];
[NSBezierPath fillRect:NSMakeRect(2.0, 14.0, 28.0, 4.0)];
[NSGraphicsContext restoreGraphicsState];
- [[NSColor colorWithCalibratedWhite:0.45 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:0.45 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];
@@ -1723,7 +1723,7 @@
[path setWindingRule:NSEvenOddWindingRule];
- [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:1.0 alpha:1.0] setFill];
[path fill];
);
@@ -1755,7 +1755,7 @@
[path setWindingRule:NSEvenOddWindingRule];
- [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:1.0 alpha:1.0] setFill];
[path fill];
);
@@ -1777,7 +1777,7 @@
static void drawTextNote() {
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.75] setFill];
NSBezierPath *path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 5.0)];
[path lineToPoint:NSMakePoint(9.0, 6.5)];
@@ -1801,7 +1801,7 @@
[path lineToPoint:NSMakePoint(8.5, 4.5)];
[path closePath];
[path stroke];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.333] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.333] setStroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(8.0, 11.5)];
[path lineToPoint:NSMakePoint(12.0, 11.5)];
@@ -1825,10 +1825,10 @@
static void drawHighlightNote() {
NSFont *font = [NSFont fontWithName:@"Helvetica" size:14.0] ?: [NSFont
systemFontOfSize:14.0];
NSGlyph glyph = [font glyphWithName:@"H"];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.25] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.25] setFill];
NSBezierPath *path = [NSBezierPath bezierPathWithRect:NSMakeRect(3.0, 2.0,
15.0, 16.0)];
[path fill];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.75] setFill];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(10.5 - NSMidX([font
boundingRectForGlyph:glyph]), 5.0)];
[path appendBezierPathWithGlyph:glyph inFont:font];
@@ -1838,7 +1838,7 @@
static void drawUnderlineNote() {
NSFont *font = [NSFont fontWithName:@"Helvetica" size:14.0] ?: [NSFont
systemFontOfSize:14.0];
NSGlyph glyph = [font glyphWithName:@"U"];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.75] setFill];
NSBezierPath *path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(10.5 - NSMidX([font
boundingRectForGlyph:glyph]), 6.0)];
[path appendBezierPathWithGlyph:glyph inFont:font];
@@ -1853,7 +1853,7 @@
static void drawStrikeOutNote() {
NSFont *font = [NSFont fontWithName:@"Helvetica" size:14.0] ?: [NSFont
systemFontOfSize:14.0];
NSGlyph glyph = [font glyphWithName:@"S"];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.75] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.75] setFill];
NSBezierPath *path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(10.5 - NSMidX([font
boundingRectForGlyph:glyph]), 5.0)];
[path appendBezierPathWithGlyph:glyph inFont:font];
@@ -2022,7 +2022,7 @@
[addPath appendBezierPathWithRect:NSMakeRect(18.0, 2.0, 1.0, 5.0)];
[NSGraphicsContext saveGraphicsState];
[[NSGraphicsContext currentContext]
setCompositingOperation:NSCompositeCopy];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.6] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.6] setFill];
[addPath fill];
[NSGraphicsContext restoreGraphicsState];
}
@@ -2034,7 +2034,7 @@
[arrowPath relativeLineToPoint:NSMakePoint(-3.0, -5.5)];
[arrowPath setLineWidth:1.5];
[arrowPath setLineCapStyle:NSRoundLineCapStyle];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.5] setStroke];
[arrowPath stroke];
}
@@ -2047,7 +2047,7 @@
static inline void drawPageBackgroundInRect(NSRect rect) {
[NSGraphicsContext saveGraphicsState];
[[NSGraphicsContext currentContext]
setCompositingOperation:NSCompositeCopy];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.25] setFill];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.25] setFill];
[NSBezierPath fillRect:rect];
[NSGraphicsContext restoreGraphicsState];
}
@@ -2074,10 +2074,10 @@
[path closePath];
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedWhite:1.0 alpha:1.0] setFill];
+ [[NSColor colorWithGenericGamma22White:1.0 alpha:1.0] setFill];
[path fill];
[NSShadow setShadowWithWhite:0.0 alpha:0.5 blurRadius:1.0 yOffset:0.0];
- [[NSColor colorWithCalibratedRed:0.257 green:0.351 blue:0.553 alpha:1.0]
setStroke];
+ [[NSColor colorWithSRGBRed:0.257 green:0.351 blue:0.553 alpha:1.0]
setStroke];
[path stroke];
[NSGraphicsContext restoreGraphicsState];
}
Modified: trunk/NSShadow_SKExtensions.m
===================================================================
--- trunk/NSShadow_SKExtensions.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/NSShadow_SKExtensions.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -51,7 +51,7 @@
}
+ (void)setShadowWithWhite:(CGFloat)white alpha:(CGFloat)alpha
blurRadius:(CGFloat)blurRadius yOffset:(CGFloat)yOffset {
- [self setShadowWithColor:[NSColor colorWithCalibratedWhite:white
alpha:alpha] blurRadius:blurRadius offset:NSMakeSize(0.0, yOffset)];
+ [self setShadowWithColor:[NSColor colorWithGenericGamma22White:white
alpha:alpha] blurRadius:blurRadius offset:NSMakeSize(0.0, yOffset)];
}
@end
Modified: trunk/NSUserDefaults_SKExtensions.m
===================================================================
--- trunk/NSUserDefaults_SKExtensions.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/NSUserDefaults_SKExtensions.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -59,7 +59,7 @@
alpha = [[array objectAtIndex:1] doubleValue];
else if ([array count] > 3)
alpha = [[array objectAtIndex:3] doubleValue];
- color = [NSColor colorWithCalibratedRed:red green:green blue:blue
alpha:alpha];
+ color = [NSColor colorWithSRGBRed:red green:green blue:blue
alpha:alpha];
}
}
return color;
Modified: trunk/PDFAnnotationInk_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.m 2021-03-01 15:52:33 UTC (rev
12153)
+++ trunk/PDFAnnotationInk_SKExtensions.m 2021-03-01 16:17:35 UTC (rev
12154)
@@ -266,7 +266,7 @@
}
[NSGraphicsContext saveGraphicsState];
[NSShadow setShadowWithWhite:0.0 alpha:0.33333 blurRadius:2.0
yOffset:-2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:[[self color]
alphaComponent]] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:[[self color]
alphaComponent]] setStroke];
[path stroke];
[NSGraphicsContext restoreGraphicsState];
[[NSGraphicsContext currentContext]
setCompositingOperation:NSCompositeClear];
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKApplicationController.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -654,7 +654,7 @@
}
- (void)setPageBackgroundColor:(NSColor *)color {
- if ([[color colorUsingColorSpaceName:NSCalibratedRGBColorSpace]
isEqual:[NSColor colorWithCalibratedRed:1.0 green:1.0 blue:1.0 alpha:1.0]])
+ if ([[color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]]
isEqual:[NSColor colorWithSRGBRed:1.0 green:1.0 blue:1.0 alpha:1.0]])
[[NSUserDefaults standardUserDefaults]
removeObjectForKey:SKPageBackgroundColorKey];
else
[[NSUserDefaults standardUserDefaults] setColor:color
forKey:SKPageBackgroundColorKey];
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKBookmark.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -800,7 +800,7 @@
static NSImage *menuIcon = nil;
if (menuIcon == nil) {
menuIcon = [[NSImage imageWithSize:NSMakeSize(16.0, 16.0) flipped:NO
drawingHandler:^(NSRect rect){
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.2] set];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.2] set];
[NSBezierPath fillRect:NSMakeRect(1.0, 1.0, 14.0, 13.0)];
[NSGraphicsContext saveGraphicsState];
NSBezierPath *path = [NSBezierPath bezierPath];
@@ -815,13 +815,13 @@
[NSShadow setShadowWithWhite:0.0 alpha:0.33333 blurRadius:2.0
yOffset:-1.0];
[path fill];
[NSGraphicsContext restoreGraphicsState];
- [[NSColor colorWithCalibratedRed:0.162 green:0.304 blue:0.755
alpha:1.0] set];
+ [[NSColor colorWithSRGBRed:0.162 green:0.304 blue:0.755 alpha:1.0]
set];
NSRectFill(NSMakeRect(2.0, 13.0, 5.0, 2.0));
- [[NSColor colorWithCalibratedRed:0.894 green:0.396 blue:0.202
alpha:1.0] set];
+ [[NSColor colorWithSRGBRed:0.894 green:0.396 blue:0.202 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 colorWithCalibratedWhite:0.6 alpha:1.0] set];
+ [[NSColor colorWithGenericGamma22White:0.6 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,11 +828,11 @@
NSUInteger i, j;
for (i = 0; i < 7; i++) {
for (j = 0; j < 3; j++) {
- [[NSColor colorWithCalibratedWhite:0.45 + 0.1 * rand() /
RAND_MAX alpha:1.0] set];
+ [[NSColor colorWithGenericGamma22White:0.45 + 0.1 * rand()
/ RAND_MAX alpha:1.0] set];
NSRectFill(NSMakeRect(6.0 + i, 4.0 + 3.0 * j, 1.0, 1.0));
}
}
- NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.1]
endingColor:[NSColor colorWithCalibratedWhite:0.0 alpha:0.0]] autorelease];
+ NSGradient *gradient = [[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithGenericGamma22White:0.0 alpha:0.1]
endingColor:[NSColor colorWithGenericGamma22White:0.0 alpha:0.0]] autorelease];
[gradient drawInRect:NSMakeRect(2.0, 2.0, 12.0,11.0) angle:90.0];
return YES;
}] retain];
Modified: trunk/SKColorCell.m
===================================================================
--- trunk/SKColorCell.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKColorCell.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -87,7 +87,7 @@
}
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- NSColor *safeColor = [color
colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+ NSColor *safeColor = [color colorUsingColorSpace:[NSColorSpace
sRGBColorSpace]];
[NSGraphicsContext saveGraphicsState];
if ([self shouldFill] == NO) {
NSRect rect = NSInsetRect(cellFrame, 1.0, 1.0);
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKColorSwatch.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -294,7 +294,7 @@
if (NSWidth(rect) > 2.0) {
NSColor *color = [[self colors] objectAtIndex:i];
if (disabled) {
- color = [color
colorUsingColorSpaceName:NSCalibratedWhiteColorSpace];
+ color = [color colorUsingColorSpace:[NSColorSpace
genericGamma22GrayColorSpace]];
CGContextSetAlpha([[NSGraphicsContext currentContext]
graphicsPort], 0.5);
}
[color drawSwatchInRect:NSInsetRect(rect, 1.0, 1.0)];
@@ -938,7 +938,7 @@
if (NSWidth(rect) > 2.0) {
NSColor *aColor = color;
if (disabled) {
- aColor = [aColor
colorUsingColorSpaceName:NSCalibratedWhiteColorSpace];
+ aColor = [aColor colorUsingColorSpace:[NSColorSpace
genericGamma22GrayColorSpace]];
CGContextSetAlpha([[NSGraphicsContext currentContext]
graphicsPort], 0.5);
}
[aColor drawSwatchInRect:NSInsetRect(rect, 1.0, 1.0)];
@@ -950,7 +950,7 @@
gray = (highlighted || selected) ? 0.55 : 0.3;
else
gray = (highlighted || selected) ? 0.5 : 0.7;
- [[NSColor colorWithCalibratedWhite:gray alpha:1.0] setStroke];
+ [[NSColor colorWithGenericGamma22White:gray alpha:1.0] setStroke];
NSBezierPath *path;
if (selected) {
path = [NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.0
yRadius:2.0];
Modified: trunk/SKDisplayPreferences.m
===================================================================
--- trunk/SKDisplayPreferences.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKDisplayPreferences.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -139,7 +139,7 @@
if ([sender selectedTag] == 0) {
if (i == -1)
i = [[colorSwatch colors] count];
- NSColor *color = [NSColor colorWithCalibratedRed:1.0 green:1.0
blue:0.5 alpha:1.0];
+ NSColor *color = [NSColor colorWithSRGBRed:1.0 green:1.0 blue:0.5
alpha:1.0];
[colorSwatch insertColor:color atIndex:i];
[colorSwatch selectColorAtIndex:i];
} else {
Modified: trunk/SKImageToolTipContext.m
===================================================================
--- trunk/SKImageToolTipContext.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKImageToolTipContext.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -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 colorWithCalibratedWhite:0.5 alpha:0.8] retain];
+ labelColor = [[NSColor colorWithGenericGamma22White:0.5 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-01 15:52:33 UTC (rev 12153)
+++ trunk/SKImageToolTipWindow.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -128,7 +128,7 @@
} else {
static NSColor *backgroundColor = nil;
if (backgroundColor == nil)
- backgroundColor = [[NSColor colorWithCalibratedRed:0.95
green:0.95 blue:0.95 alpha:1.0] retain];
+ backgroundColor = [[NSColor colorWithSRGBRed:0.95 green:0.95
blue:0.95 alpha:1.0] retain];
[self setBackgroundColor:backgroundColor];
}
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKLineInspector.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -168,7 +168,7 @@
MAKE_IMAGE(styleButton, kPDFBorderStyleBeveled, size,
NSBezierPath *path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0,
3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.25] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.25] setStroke];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(7.0, 3.0)];
@@ -175,7 +175,7 @@
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 8.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.35] set];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.35] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -192,7 +192,7 @@
MAKE_IMAGE(styleButton, kPDFBorderStyleInset, size,
NSBezierPath *path = [NSBezierPath bezierPathWithRect:NSMakeRect(6.0,
3.0, 17.0, 6.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.25] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.25] setStroke];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(6.0, 4.0)];
@@ -199,7 +199,7 @@
[path lineToPoint:NSMakePoint(6.0, 9.0)];
[path lineToPoint:NSMakePoint(22.0, 9.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.35] set];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.35] set];
[path stroke];
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(5.0, 2.0)];
@@ -218,7 +218,7 @@
[path moveToPoint:NSMakePoint(6.0, 3.0)];
[path lineToPoint:NSMakePoint(23.0, 3.0)];
[path setLineWidth:2.0];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.5] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.5] setStroke];
[path stroke];
);
Modified: trunk/SKNoteTableRowView.m
===================================================================
--- trunk/SKNoteTableRowView.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKNoteTableRowView.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -57,7 +57,7 @@
if (resizeIndicatorCell == nil) {
NSImage *image = [[NSImage alloc] initWithSize:NSMakeSize(7.0, 5.0)];
[image lockFocus];
- [[NSColor colorWithCalibratedWhite:0.0 alpha:0.7] setStroke];
+ [[NSColor colorWithGenericGamma22White:0.0 alpha:0.7] setStroke];
[NSBezierPath strokeLineFromPoint:NSMakePoint(1.0, 3.5)
toPoint:NSMakePoint(7.0, 3.5)];
[NSBezierPath strokeLineFromPoint:NSMakePoint(3.0, 1.5)
toPoint:NSMakePoint(5.0, 1.5)];
[image unlockFocus];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKPDFView.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -4698,7 +4698,7 @@
NSShadow *aShadow = nil;
if ([self displaysPageBreaks]) {
aShadow = [[[NSShadow alloc] init] autorelease];
- [aShadow setShadowColor:[NSColor colorWithCalibratedWhite:0.0
alpha:0.3]];
+ [aShadow setShadowColor:[NSColor colorWithGenericGamma22White:0.0
alpha:0.3]];
[aShadow setShadowBlurRadius:4.0 * magnification * [self
scaleFactor]];
[aShadow setShadowOffset:NSMakeSize(0.0, -1.0 * magnification *
[self scaleFactor])];
}
Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m 2021-03-01 15:52:33 UTC (rev 12153)
+++ trunk/SKThumbnailView.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -216,7 +216,7 @@
NSRect rect = [self markRect];
if (NSIntersectsRect(dirtyRect, rect)) {
[NSGraphicsContext saveGraphicsState];
- [[NSColor colorWithCalibratedRed:0.581 green:0.088 blue:0.319
alpha:1.0] setFill];
+ [[NSColor colorWithSRGBRed:0.581 green:0.088 blue:0.319 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-01 15:52:33 UTC (rev 12153)
+++ trunk/SKTopBarView.m 2021-03-01 16:17:35 UTC (rev 12154)
@@ -84,9 +84,9 @@
[super addSubview:backgroundView];
} else {
static CGFloat defaultGrays[5] = {0.85, 0.9, 0.9, 0.95, 0.75};
- backgroundColors = [[NSArray alloc] initWithObjects:[NSColor
colorWithCalibratedWhite:defaultGrays[0] alpha:1.0], [NSColor
colorWithCalibratedWhite:defaultGrays[1] alpha:1.0], nil];
- alternateBackgroundColors = [[NSArray alloc]
initWithObjects:[NSColor colorWithCalibratedWhite:defaultGrays[2] alpha:1.0],
[NSColor colorWithCalibratedWhite:defaultGrays[3] alpha:1.0], nil];
- separatorColor = [[NSColor
colorWithCalibratedWhite:defaultGrays[4] alpha:1.0] retain];
+ 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];
}
contentView = [[NSView alloc] initWithFrame:[self contentRect]];
[super addSubview:contentView];
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2021-03-01 15:52:33 UTC
(rev 12153)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2021-03-01 16:17:35 UTC
(rev 12154)
@@ -626,7 +626,7 @@
- (NSDictionary *)SkimNoteProperties{
NSMutableDictionary *dict = [self genericSkimNoteProperties];
[dict setValue:[self font] forKey:SKNPDFAnnotationFontKey];
- if ([self respondsToSelector:@selector(fontColor)] && [[self fontColor]
isEqual:[NSColor colorWithCalibratedWhite:0.0 alpha:0.0]] == NO)
+ if ([self respondsToSelector:@selector(fontColor)] && [[self fontColor]
isEqual:[NSColor colorWithGenericGamma22White:0.0 alpha:0.0]] == NO)
[dict setValue:[self fontColor] forKey:SKNPDFAnnotationFontColorKey];
[dict setValue:[NSNumber numberWithInteger:[self alignment]]
forKey:SKNPDFAnnotationAlignmentKey];
if ([self respondsToSelector:@selector(rotation)])
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
