Revision: 27032 http://sourceforge.net/p/bibdesk/svn/27032 Author: hofman Date: 2021-10-13 14:55:00 +0000 (Wed, 13 Oct 2021) Log Message: ----------- D=ynamic colors have the same alpha in light and dark mode
Modified Paths: -------------- trunk/bibdesk/BDSKPreferenceController.m trunk/bibdesk/BDSKRatingButtonCell.m trunk/bibdesk/BDSKZoomablePDFView.m trunk/bibdesk/NSColor_BDSKExtensions.h trunk/bibdesk/NSColor_BDSKExtensions.m Modified: trunk/bibdesk/BDSKPreferenceController.m =================================================================== --- trunk/bibdesk/BDSKPreferenceController.m 2021-10-13 14:38:58 UTC (rev 27031) +++ trunk/bibdesk/BDSKPreferenceController.m 2021-10-13 14:55:00 UTC (rev 27032) @@ -705,7 +705,7 @@ BDSKColoredView *prevBgView = nil; NSLayoutConstraint *bottomConstraint = nil; NSMutableArray *constraints = [NSMutableArray array]; - NSColor *backgroundColor = [NSColor colorWithGenericGamma22AquaWhite:0.0 alpha:0.03 darkAquaWhite:1.0 alpha:0.03]; + NSColor *backgroundColor = [NSColor colorWithGenericGamma22AquaWhite:0.0 darkAquaWhite:1.0 alpha:0.03]; #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wpartial-availability" NSColor *dividerColor = [NSColor respondsToSelector:@selector(separatorColor)] ? [NSColor separatorColor] : [[NSColor controlTextColor] colorWithAlphaComponent:0.1]; Modified: trunk/bibdesk/BDSKRatingButtonCell.m =================================================================== --- trunk/bibdesk/BDSKRatingButtonCell.m 2021-10-13 14:38:58 UTC (rev 27031) +++ trunk/bibdesk/BDSKRatingButtonCell.m 2021-10-13 14:55:00 UTC (rev 27032) @@ -342,8 +342,8 @@ color = [NSColor systemGrayColor]; if ([self isEnabled] == NO) color = [color colorWithAlphaComponent:0.5]; - borderColor = [NSColor colorWithGenericGamma22AquaWhite:0.7 alpha:1.0 darkAquaWhite:0.4 alpha:1.0]; - [[NSColor colorWithGenericGamma22AquaWhite:1.0 alpha:1.0 darkAquaWhite:0.25 alpha:1.0] set]; + borderColor = [NSColor colorWithGenericGamma22AquaWhite:0.7 darkAquaWhite:0.4 alpha:1.0]; + [[NSColor colorWithGenericGamma22AquaWhite:1.0 darkAquaWhite:0.25 alpha:1.0] set]; [NSBezierPath fillRect:buttonRect]; [borderColor set]; [NSBezierPath setDefaultLineWidth:1.0]; Modified: trunk/bibdesk/BDSKZoomablePDFView.m =================================================================== --- trunk/bibdesk/BDSKZoomablePDFView.m 2021-10-13 14:38:58 UTC (rev 27031) +++ trunk/bibdesk/BDSKZoomablePDFView.m 2021-10-13 14:55:00 UTC (rev 27032) @@ -207,9 +207,9 @@ BDSKColoredView *view = (BDSKColoredView *)[self superview]; if ([view respondsToSelector:@selector(setBackgroundColor:)]) { if ([NSScroller preferredScrollerStyle] == NSScrollerStyleLegacy) - [view setBackgroundColor:[NSColor colorWithGenericGamma22AquaWhite:0.976 alpha:1.0 darkAquaWhite:0.167 alpha:1.0]]; + [view setBackgroundColor:[NSColor colorWithGenericGamma22AquaWhite:0.976 darkAquaWhite:0.167 alpha:1.0]]; else - [view setBackgroundColor:[NSColor colorWithGenericGamma22AquaWhite:1.0 alpha:1.0 darkAquaWhite:0.0 alpha:1.0]]; + [view setBackgroundColor:[NSColor colorWithGenericGamma22AquaWhite:1.0 darkAquaWhite:0.0 alpha:1.0]]; [view setNeedsDisplay:YES]; } } @@ -269,7 +269,6 @@ // @@ Dark mode BDSKColoredView *containerView = [[[BDSKColoredView alloc] initWithFrame:[self frame]] autorelease]; - [containerView setBackgroundColor:[NSColor colorWithGenericGamma22AquaWhite:1.0 alpha:1.0 darkAquaWhite:0.0 alpha:1.0]]; [containerView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [[self superview] addSubview:containerView]; Modified: trunk/bibdesk/NSColor_BDSKExtensions.h =================================================================== --- trunk/bibdesk/NSColor_BDSKExtensions.h 2021-10-13 14:38:58 UTC (rev 27031) +++ trunk/bibdesk/NSColor_BDSKExtensions.h 2021-10-13 14:55:00 UTC (rev 27032) @@ -58,7 +58,7 @@ @interface NSColor (BDSKExtensions) + (NSColor *)colorWithAquaColor:(NSColor *)aAquaColor darkAquaColor:(NSColor *)aDarkAquaColor; -+ (NSColor *)colorWithGenericGamma22AquaWhite:(CGFloat)aquaWhite alpha:(CGFloat)aquaAlpha darkAquaWhite:(CGFloat)darkAquaWhite alpha:(CGFloat)darkAquaAlpha; ++ (NSColor *)colorWithGenericGamma22AquaWhite:(CGFloat)aquaWhite darkAquaWhite:(CGFloat)darkAquaWhite alpha:(CGFloat)alpha; + (NSArray *)alternateControlAlternatingRowBackgroundColors; Modified: trunk/bibdesk/NSColor_BDSKExtensions.m =================================================================== --- trunk/bibdesk/NSColor_BDSKExtensions.m 2021-10-13 14:38:58 UTC (rev 27031) +++ trunk/bibdesk/NSColor_BDSKExtensions.m 2021-10-13 14:55:00 UTC (rev 27032) @@ -153,8 +153,8 @@ // @@ Dark mode -+ (NSColor *)colorWithGenericGamma22AquaWhite:(CGFloat)aquaWhite alpha:(CGFloat)aquaAlpha darkAquaWhite:(CGFloat)darkAquaWhite alpha:(CGFloat)darkAquaAlpha { - return [self colorWithAquaColor:[NSColor colorWithGenericGamma22White:aquaWhite alpha:aquaAlpha] darkAquaColor:[NSColor colorWithGenericGamma22White:darkAquaWhite alpha:darkAquaAlpha]]; ++ (NSColor *)colorWithGenericGamma22AquaWhite:(CGFloat)aquaWhite darkAquaWhite:(CGFloat)darkAquaWhite alpha:(CGFloat)alpha { + return [self colorWithAquaColor:[NSColor colorWithGenericGamma22White:aquaWhite alpha:alpha] darkAquaColor:[NSColor colorWithGenericGamma22White:darkAquaWhite alpha:alpha]]; } + (NSArray *)alternateControlAlternatingRowBackgroundColors { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Bibdesk-commit mailing list Bibdesk-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-commit