Revision: 12158
http://sourceforge.net/p/skim-app/code/12158
Author: hofman
Date: 2021-03-02 16:50:36 +0000 (Tue, 02 Mar 2021)
Log Message:
-----------
remove legacy source list colors
Modified Paths:
--------------
trunk/NSColor_SKExtensions.h
trunk/NSColor_SKExtensions.m
trunk/SKColorSwatch.m
Modified: trunk/NSColor_SKExtensions.h
===================================================================
--- trunk/NSColor_SKExtensions.h 2021-03-02 16:04:33 UTC (rev 12157)
+++ trunk/NSColor_SKExtensions.h 2021-03-02 16:50:36 UTC (rev 12158)
@@ -76,11 +76,6 @@
+ (void)makeHighlightColors;
-+ (NSColor *)keySourceListHighlightColor;
-+ (NSColor *)mainSourceListHighlightColor;
-+ (NSColor *)disabledSourceListHighlightColor;
-+ (NSColor *)mainSourceListBackgroundColor;
-
+ (NSColor *)selectionHighlightColor:(BOOL)active;
+ (NSColor *)selectionHighlightInteriorColor:(BOOL)active;
Modified: trunk/NSColor_SKExtensions.m
===================================================================
--- trunk/NSColor_SKExtensions.m 2021-03-02 16:04:33 UTC (rev 12157)
+++ trunk/NSColor_SKExtensions.m 2021-03-02 16:50:36 UTC (rev 12158)
@@ -109,55 +109,6 @@
#pragma mark Legacy colors
-+ (NSColor *)keySourceListHighlightColor {
- static NSColor *color = nil;
- static NSColor *graphiteColor = nil;
- if ([NSColor currentControlTint] == NSGraphiteControlTint) {
- if (graphiteColor == nil)
- graphiteColor = [[NSColor colorWithCalibratedRed:0.555 green:0.555
blue:0.578 alpha:1.0] retain];
- return graphiteColor;
- } else {
- if (color == nil)
- color = [[NSColor colorWithCalibratedRed:0.251 green:0.487
blue:0.780 alpha:1.0] retain];
- return color;
- }
-}
-
-+ (NSColor *)mainSourceListHighlightColor {
- static NSColor *color = nil;
- static NSColor *graphiteColor = nil;
- if ([NSColor currentControlTint] == NSGraphiteControlTint) {
- if (graphiteColor == nil)
- graphiteColor = [[NSColor colorWithCalibratedRed:0.572 green:0.627
blue:0.680 alpha:1.0] retain];
- return graphiteColor;
- } else {
- if (color == nil)
- color = [[NSColor colorWithCalibratedRed:0.556 green:0.615
blue:0.748 alpha:1.0] retain];
- return color;
- }
-}
-
-+ (NSColor *)disabledSourceListHighlightColor {
- static NSColor *color = nil;
- static NSColor *graphiteColor = nil;
- if ([NSColor currentControlTint] == NSGraphiteControlTint) {
- if (graphiteColor == nil)
- graphiteColor = [[NSColor colorWithCalibratedRed:0.576 green:0.576
blue:0.576 alpha:1.0] retain];
- return graphiteColor;
- } else {
- if (color == nil)
- color = [[NSColor colorWithCalibratedRed:0.576 green:0.576
blue:0.576 alpha:1.0] retain];
- return color;
- }
-}
-
-+ (NSColor *)mainSourceListBackgroundColor {
- static NSColor *color = nil;
- if (color == nil)
- color = [[NSColor colorWithCalibratedRed:0.839216 green:0.866667
blue:0.898039 alpha:1.0] retain];
- return color;
-}
-
+ (NSColor *)pdfControlBackgroundColor {
static NSColor *color = nil;
if (color == nil) {
@@ -166,6 +117,8 @@
return color;
}
+#pragma mark Favorite Colors
+
+ (NSArray *)favoriteColors {
NSValueTransformer *transformer = [NSValueTransformer
arrayTransformerWithValueTransformerForName:NSUnarchiveFromDataTransformerName];
return [transformer transformedValue:[[NSUserDefaults
standardUserDefaults] arrayForKey:SKSwatchColorsKey]];
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2021-03-02 16:04:33 UTC (rev 12157)
+++ trunk/SKColorSwatch.m 2021-03-02 16:50:36 UTC (rev 12158)
@@ -976,7 +976,7 @@
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(NSMinX(rect), NSMinY(rect) - 1.0)];
[path lineToPoint:NSMakePoint(NSMinX(rect), NSMaxY(rect) + 1.0)];
- } else {
+ } else if (dropLocation == SKColorSwatchDropAfter) {
path = [NSBezierPath bezierPath];
[path moveToPoint:NSMakePoint(NSMaxX(rect), NSMinY(rect) - 1.0)];
[path lineToPoint:NSMakePoint(NSMaxX(rect), NSMaxY(rect) + 1.0)];
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
