diff --git a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h index 7772b17..6927443 100644 --- a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h @@ -15,17 +15,16 @@ for(NSNumber *width in @[@280,@320,@400]){ [view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES; for(NSView *button in buttons){fit&=NSMinX(button.frame)>=0&&NSMaxX(button.frame)<=width.doubleValue&&button.frame.size.width>=66;for(NSView *other in buttons)if(button!=other)fit&=!NSIntersectsRect(button.frame,other.frame);} - NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==9&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]); + NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==2&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]); + for(NSButton *mode in themes){fit&=mode.frame.size.width>=44&&NSMaxX(mode.frame)<=NSMinX([[view valueForKey:@"resetAll"]frame])&&mode.title.length>0;for(NSButton *other in themes)if(mode!=other)fit&=!NSIntersectsRect(mode.frame,other.frame);} run.record([NSString stringWithFormat:@"compact-header-controls-fit-%@",width],fit); } DYDiagnosticManager *fresh=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(fresh,nil);run.record(@"compact-new-host-stays-original-flow",!DYReadAssets(fresh,kCMTimeZero).colorManagement); NSInteger previous=DYThemeIndex();@try{ - BOOL colors=DYThemeNames().count==9&&[DYThemeNames()[5]isEqual:@"黑金渐变"]; - for(NSInteger i=0;i<9;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];} - run.record(@"compact-nine-stable-theme-choices",colors); - DYSetThemeIndex(5);auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);}; - double minimum=100;for(NSString *text in @[@"text",@"secondary"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop"])minimum=std::min(minimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05)); - run.record(@"compact-gold-labels-have-readable-contrast",minimum>=4.5,@{@"minimumContrast":@(minimum)}); + BOOL colors=DYThemeNames().count==2&&[DYThemeNames()[0]isEqual:@"浅色"]&&[DYThemeNames()[1]isEqual:@"深色"]; + for(NSInteger i=7;i<=8;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];} + run.record(@"compact-only-light-dark-choices",colors); + auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);}; NSDictionary *themeSnapshot=[view presetSnapshot];int themeUndo=host->_undoStarts; DYSetThemeIndex(7);double lightMinimum=100; for(NSString *text in @[@"text",@"secondary",@"slot15",@"accent"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop",@"headerBottom"]) @@ -41,14 +40,12 @@ [view performSelector:@selector(themeChanged:) withObject:nil]; run.record(@"soft-dark-native-appearance-without-text-glow",[view.appearance.name isEqual:NSAppearanceNameDarkAqua]&&DYThemeTextShadow()==nil); run.record(@"soft-dark-theme-preserves-grade-and-undo",[themeSnapshot isEqual:[view presetSnapshot]]&&themeUndo==host->_undoStarts); - DYSetThemeIndex(5); + DYSetThemeIndex(6);run.record(@"compact-removed-themes-cannot-be-selected",DYThemeIndex()==8); DYThemePopUpButton *pullDown=[[[DYThemePopUpButton alloc]initWithFrame:NSMakeRect(0,0,240,28) pullsDown:YES]autorelease];[pullDown addItemWithTitle:@"+ 添加模块"];pullDown.font=[NSFont systemFontOfSize:11]; NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:240 pixelsHigh:28 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease]; [NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[pullDown drawRect:pullDown.bounds];[NSGraphicsContext restoreGraphicsState];NSUInteger glyphPixels=0; for(int y=6;y<23;y++)for(int x=9;x<90;x++){NSColor *c=[bitmap colorAtX:x y:y];if(c.redComponent>.55&&c.greenComponent>.35)glyphPixels++;} - run.record(@"compact-gold-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)}); - BOOL reduced=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency; - run.record(@"compact-gold-glow-respects-system-display-options",reduced?DYThemeTextShadow()==nil:DYThemeTextShadow().shadowBlurRadius<=2); + run.record(@"compact-dark-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)}); }@finally{DYSetThemeIndex(previous);} } // Histogram math is independent of UI palettes and never edits a host document. @@ -77,7 +74,7 @@ run.record(@"histogram-channel-and-overlay-presentation-does-not-edit-grade",[before isEqual:[view presetSnapshot]]&&host->_undoStarts==0&&host->_undoEnds==0); [renderer invalidatePreview];[view performSelector:@selector(previewChanged:) withObject:nil]; run.record(@"histogram-invalidation-clears-view-and-renderer",![renderer histogram]&&![graph valueForKey:@"histogram"]); - NSInteger previous=DYThemeIndex();DYSetThemeIndex(6); - run.record(@"neon-stable-theme-id-and-no-text-glow",[DYThemeNames()[6]isEqual:@"霓虹炫彩"]&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]); + NSInteger previous=DYThemeIndex();DYSetThemeIndex(8); + run.record(@"relief-only-two-choices-and-no-text-glow",DYThemeNames().count==2&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]); DYSetThemeIndex(previous); } diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index ab1a9e9..aa5b06e 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -88,7 +88,7 @@ static NSString *DYNumber(double value,NSDictionary *d) { NSArray *colors=[self trackColors];if(colors){NSGradient *g=[[[NSGradient alloc]initWithColors:colors]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5] angle:0];return;} NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];NSGradient *base=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot8"] endingColor:DYThemePalette()[@"slot9"]]autorelease];[base drawInBezierPath:bar angle:90];[[(DYThemeIsLight()?DYAccent():NSColor.blackColor) colorWithAlphaComponent:DYThemeIsLight()?.20:.28]setStroke];bar.lineWidth=.6;[bar stroke]; double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue); - NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:(DYThemeIndex()==6||DYThemeIsLight())?0:90]; + NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:0]; } - (void)drawKnob:(NSRect)knobRect { NSRect circle=NSInsetRect(knobRect,1,1); @@ -178,17 +178,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { - (void)drawRect:(NSRect)dirtyRect { NSRect r=NSInsetRect(self.bounds,.5,2); NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7]; - if(DYThemeUsesRelief()){ - BOOL expanded=self.state==NSControlStateValueOn;DYDrawSoftControl(NSInsetRect(self.bounds,2,3),7,expanded,NO,self.cell.highlighted); - }else if(DYThemeIndex()==6){ - NSDictionary *palette=DYThemePalette();BOOL expanded=self.state==NSControlStateValueOn; - NSColor *left=[palette[@"headerTop"]blendedColorWithFraction:expanded?.32:.22 ofColor:palette[@"activeTop"]]; - NSColor *right=[palette[@"headerBottom"]blendedColorWithFraction:expanded?.26:.18 ofColor:palette[@"activeBottom"]]; - NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:left endingColor:right]autorelease];[gradient drawInBezierPath:pill angle:0]; - [[NSColor colorWithCalibratedRed:.72 green:.67 blue:.88 alpha:expanded?.65:.40]setStroke];pill.lineWidth=1;[pill stroke]; - }else{ - NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];[g drawInBezierPath:pill angle:90]; - } + BOOL expanded=self.state==NSControlStateValueOn;DYDrawSoftControl(NSInsetRect(self.bounds,2,3),7,expanded,NO,self.cell.highlighted); NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk()); [(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes]; [self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes]; @@ -206,8 +196,6 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { - (void)dealloc {[_swatch release];[super dealloc];} - (void)drawRect:(NSRect)dirtyRect { NSRect r=NSInsetRect(self.bounds,3,3);[_swatch setFill];NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:r xRadius:5 yRadius:5];[p fill]; - if([self.identifier isEqual:@"themeSwatch"]&&self.tag>=7){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:self.tag==7?[NSColor colorWithSRGBRed:.96 green:.99 blue:1 alpha:1]:[NSColor colorWithSRGBRed:.10 green:.12 blue:.15 alpha:1] endingColor:self.tag==7?[NSColor colorWithSRGBRed:.74 green:.87 blue:.95 alpha:1]:[NSColor colorWithSRGBRed:.43 green:.67 blue:.76 alpha:1]]autorelease];[g drawInBezierPath:p angle:45];} - else if([self.identifier isEqual:@"themeSwatch"]&&self.tag>=5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:self.tag==6?[NSColor colorWithSRGBRed:.8 green:.12 blue:1 alpha:1]:NSColor.blackColor endingColor:self.tag==6?NSColor.cyanColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];} if([self.identifier isEqual:@"customColorSwatch"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[NSColor.systemRedColor,NSColor.systemYellowColor,NSColor.systemGreenColor,NSColor.systemCyanColor,NSColor.systemBlueColor,NSColor.systemPurpleColor]]autorelease];[g drawInBezierPath:p angle:45];[@"⌾" drawInRect:NSInsetRect(r,3,1) withAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:16],NSForegroundColorAttributeName:NSColor.whiteColor}];} if(self.state==NSControlStateValueOn){[DYInk() setStroke];p.lineWidth=2;[p stroke];} } @@ -303,8 +291,7 @@ static NSArray *DYPresentationSections(void) { } - (void)drawRect:(NSRect)dirtyRect { NSRect r=[self plotRect]; - if(DYThemeUsesRelief())DYDrawSoftControl(r,5,YES,NO,NO); - else{[(DYThemeIndex()==6?[NSColor colorWithSRGBRed:.025 green:.02 blue:.06 alpha:1]:DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];} + DYDrawSoftControl(r,5,YES,NO,NO); if(_histogramToggle.state==NSControlStateValueOn){ const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr; if(h&&h->samples){ @@ -341,7 +328,7 @@ static NSArray *DYPresentationSections(void) { NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-fmax(0,fmin(1,y)))*r.size.height); if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q]; } - NSColor *color=_channel==0?(DYThemeIsLight()?DYInk():DYThemeIndex()==6?NSColor.whiteColor:DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke]; + NSColor *color=_channel==0?(DYThemeIsLight()?DYInk():DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke]; for(NSDictionary *point in points) {NSPoint q=[self positionOfPoint:point];[color setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] fill];[DYInk() setStroke];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] stroke];} NSDictionary *axis=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:8 weight:NSFontWeightRegular],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}; [@"0" drawAtPoint:NSMakePoint(NSMinX(r),NSMaxY(r)+2) withAttributes:axis];[@"128" drawAtPoint:NSMakePoint(NSMidX(r)-7,NSMaxY(r)+2) withAttributes:axis];[@"255" drawAtPoint:NSMakePoint(NSMaxX(r)-14,NSMaxY(r)+2) withAttributes:axis]; @@ -519,7 +506,7 @@ static NSImage *DYWheelImage(void) { for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];} for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;} NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i *DYThemePalette(void); FOUNDATION_EXPORT NSColor *DYThemeColor(NSString *role); -FOUNDATION_EXPORT NSColor *DYThemeSwatch(NSInteger index); FOUNDATION_EXPORT BOOL DYThemeIsLight(void); FOUNDATION_EXPORT BOOL DYThemeUsesRelief(void); // Opaque relief with a directional reflective rim; native controls retain their actions. diff --git a/大鱼调色/Plugin/DYTheme.mm b/大鱼调色/Plugin/DYTheme.mm index e5d53b0..8fac6de 100644 --- a/大鱼调色/Plugin/DYTheme.mm +++ b/大鱼调色/Plugin/DYTheme.mm @@ -23,53 +23,39 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra } @end static DYThemeStore *store(void){static DYThemeStore *s;static dispatch_once_t once;dispatch_once(&once,^{s=[DYThemeStore new];});return s;} -NSArray *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变",@"霓虹炫彩",@"冰蓝柔光",@"曜石柔光"];} -NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<9?i:7;} -static const double paletteRGB[9][17][3]={ - {{0.11,0.12,0.14},{0.075,0.08,0.095},{0.17,0.18,0.21},{0.12,0.13,0.15},{0.27,0.29,0.33},{0.2,0.22,0.25},{0.36,0.39,0.44},{0.25,0.28,0.32},{0.21,0.23,0.26},{0.15,0.17,0.2},{0.78,0.83,0.9},{0.55,0.61,0.7},{1.0,1.0,1.0},{0.78,0.82,0.88},{0.96,0.97,0.98},{0.86,0.89,0.92},{0.67,0.72,0.77}}, - {{0.031,0.086,0.148},{0.025,0.075,0.13},{0.07,0.155,0.235},{0.045,0.12,0.19},{0.115,0.22,0.33},{0.07,0.15,0.24},{0.15,0.33,0.5},{0.08,0.24,0.36},{0.23,0.32,0.41},{0.18,0.26,0.35},{0.38,0.76,1.0},{0.23,0.64,0.97},{0.96,0.98,1.0},{0.62,0.7,0.76},{0.88,0.96,1.0},{0.82,0.9,0.96},{0.58,0.7,0.78}}, - {{0.11,0.09,0.17},{0.07,0.06,0.12},{0.18,0.14,0.28},{0.13,0.1,0.21},{0.27,0.22,0.42},{0.2,0.16,0.31},{0.43,0.34,0.68},{0.31,0.23,0.52},{0.22,0.18,0.31},{0.15,0.12,0.23},{0.78,0.71,1.0},{0.5,0.42,0.93},{0.95,0.9,1.0},{0.63,0.5,0.95},{0.98,0.95,1.0},{0.9,0.86,0.97},{0.7,0.66,0.82}}, - {{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}}, - {{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}}, - {{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}}, - {{.11,.10,.13},{.045,.040,.055},{.16,.14,.20},{.083,.073,.103},{.115,.104,.139},{.15,.135,.18},{.16,.145,.19},{.105,.10,.13},{.24,.22,.28},{.14,.125,.17},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.75,.72,.82},{.95,.97,1},{.86,.86,.91},{.67,.64,.73}}, - {{.89,.94,.97},{.84,.91,.95},{.94,.98,1},{.90,.95,.98},{.83,.90,.95},{.91,.96,.99},{.95,.985,1},{.83,.91,.96},{.74,.84,.90},{.88,.94,.97},{.52,.61,.89},{.29,.74,.80},{.96,.99,1},{.40,.55,.65},{.12,.28,.34},{.17,.32,.39},{.20,.33,.41}}, - {{.10,.105,.12},{.055,.056,.065},{.17,.18,.20},{.115,.119,.135},{.065,.073,.09},{.13,.14,.16},{.18,.19,.22},{.105,.11,.13},{.25,.27,.31},{.10,.11,.13},{.62,.55,.91},{.25,.75,.82},{.88,.94,.98},{.55,.64,.72},{.94,.96,.99},{.85,.89,.94},{.65,.70,.77}} +// Appearance IDs 7/8 preserve the approved light/dark preferences. Legacy +// colorful IDs are intentionally unavailable and fall back to dark on read. +NSArray *DYThemeNames(void){return @[@"浅色",@"深色"];} +NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i==7||i==8?i:8;} +void DYSetThemeIndex(NSInteger index){if(index!=7&&index!=8)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];} +static const double paletteRGB[2][17][3]={ +{{.89,.94,.97},{.84,.91,.95},{.94,.98,1},{.90,.95,.98},{.83,.90,.95},{.91,.96,.99},{.95,.985,1},{.83,.91,.96},{.74,.84,.90},{.88,.94,.97},{.52,.61,.89},{.29,.74,.80},{.96,.99,1},{.40,.55,.65},{.12,.28,.34},{.17,.32,.39},{.20,.33,.41}}, +{{.10,.105,.12},{.055,.056,.065},{.17,.18,.20},{.115,.119,.135},{.065,.073,.09},{.13,.14,.16},{.18,.19,.22},{.105,.11,.13},{.25,.27,.31},{.10,.11,.13},{.62,.55,.91},{.25,.75,.82},{.88,.94,.98},{.55,.64,.72},{.94,.96,.99},{.85,.89,.94},{.65,.70,.77}} }; -NSColor *DYThemeSwatch(NSInteger index){static const double values[9][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36},{.65,.38,1},{.82,.93,.98},{.27,.35,.42}};index=MAX(0,MIN(8,index));return rgb(values[index][0],values[index][1],values[index][2]);} -void DYSetThemeIndex(NSInteger index){if(index<0||index>8)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];} NSDictionary *DYThemePalette(void){ static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{ NSMutableArray *all=[NSMutableArray array]; - for(NSInteger index=0;index<9;index++){ + for(NSInteger index=0;index<2;index++){ const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary]; for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]); - NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):index==6?rgb(.78,.75,.87):index==7?rgb(.20,.35,.44):index==8?rgb(.62,.80,.88):DYThemeSwatch(index); - [d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.065,.060,.080);d[@"cardEnd"]=rgb(.093,.090,.110);d[@"border"]=[rgb(.36,.33,.43)colorWithAlphaComponent:.40];} if(index==7){d[@"backgroundEnd"]=rgb(.90,.95,.98);d[@"cardEnd"]=rgb(.86,.93,.97);d[@"border"]=rgb(.55,.70,.79);} - if(index==8){d[@"backgroundEnd"]=rgb(.085,.09,.10);d[@"cardEnd"]=rgb(.15,.16,.18);d[@"border"]=rgb(.39,.56,.65);} + NSColor *accent=index==0?rgb(.20,.35,.44):rgb(.62,.80,.88); + [d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}]; + d[@"backgroundEnd"]=index==0?rgb(.90,.95,.98):rgb(.085,.09,.10); + d[@"cardEnd"]=index==0?rgb(.86,.93,.97):rgb(.15,.16,.18); + d[@"border"]=index==0?rgb(.55,.70,.79):rgb(.39,.56,.65); [all addObject:[[d copy]autorelease]]; }palettes=[all copy]; - });return palettes[DYThemeIndex()]; + });return palettes[DYThemeIndex()==7?0:1]; } NSColor *DYThemeColor(NSString *role){ static NSDictionary *colors;static dispatch_once_t once;dispatch_once(&once,^{ NSMutableDictionary *all=[NSMutableDictionary dictionary];for(NSString *key in DYThemePalette())all[key]=[NSColor colorWithName:[@"Dayu." stringByAppendingString:key] dynamicProvider:^NSColor *(NSAppearance *appearance){return DYThemePalette()[key];}];colors=[all copy]; });return colors[role]?:NSColor.whiteColor; } - -NSShadow *DYThemeTextShadow(void) { - NSWorkspace *workspace=NSWorkspace.sharedWorkspace; - if(DYThemeIndex()!=5||workspace.accessibilityDisplayShouldIncreaseContrast||workspace.accessibilityDisplayShouldReduceTransparency)return nil; - NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[DYThemeColor(@"accent")colorWithAlphaComponent:.30];shadow.shadowBlurRadius=1.8;shadow.shadowOffset=NSZeroSize;return shadow; -} -NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) { - NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:@{NSFontAttributeName:font,NSForegroundColorAttributeName:color}]; - NSShadow *shadow=DYThemeTextShadow();if(shadow)attributes[NSShadowAttributeName]=shadow;return attributes; -} +NSShadow *DYThemeTextShadow(void) {return nil;} +NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {return @{NSFontAttributeName:font,NSForegroundColorAttributeName:color};} void DYDrawThemeSurface(NSBezierPath *path,BOOL card) { - NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background"; - if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];} - else {[palette[role]setFill];[path fill];} + NSDictionary *palette=DYThemePalette();NSGradient *g=[[[NSGradient alloc]initWithStartingColor:palette[card?@"card":@"background"] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[g drawInBezierPath:path angle:35]; } BOOL DYThemeIsLight(void) {return DYThemeIndex()==7;} BOOL DYThemeUsesRelief(void) {return DYThemeIndex()==7||DYThemeIndex()==8;} @@ -123,37 +109,32 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized, [[rgb(.40,.60,.73)colorWithAlphaComponent:strong?.35:.12]setStroke];inner.lineWidth=.5;[inner stroke]; } @implementation DYThemeLabel -- (void)drawRect:(NSRect)rect {[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[super drawRect:rect];[NSGraphicsContext restoreGraphicsState];} +- (void)drawRect:(NSRect)rect {[super drawRect:rect];} @end @interface DYThemeButtonCell : NSButtonCell @end @implementation DYThemeButtonCell - (NSRect)drawTitle:(NSAttributedString*)title withFrame:(NSRect)frame inView:(NSView*)view { - if(DYThemeIndex()<5)return [super drawTitle:title withFrame:frame inView:view]; - NSMutableAttributedString *gold=[[title mutableCopy]autorelease];[gold addAttributes:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,gold.length)];return [super drawTitle:gold withFrame:frame inView:view]; + BOOL selected=[view.identifier isEqual:@"appearanceToggle"]&&self.state==NSControlStateValueOn; + NSMutableAttributedString *styled=[[title mutableCopy]autorelease]; + NSFont *font=selected?[NSFont boldSystemFontOfSize:11]:(self.font?:[NSFont systemFontOfSize:11]); + [styled addAttributes:DYThemeTextAttributes(font,[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,styled.length)];return [super drawTitle:styled withFrame:frame inView:view]; } - (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view { - if(DYThemeIndex()<5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;} - if(DYThemeUsesRelief()){DYDrawSoftControl(NSInsetRect(frame,2,3),7,NO,[view.identifier isEqual:@"primaryAction"],self.highlighted);return;} - NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];if(DYThemeIndex()==6&&[view.identifier isEqual:@"primaryAction"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[DYThemePalette()[@"activeTop"],DYThemePalette()[@"activeBottom"]]]autorelease];[g drawInBezierPath:path angle:0];}else DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke]; + if(!self.bordered){[super drawBezelWithFrame:frame inView:view];return;} + BOOL selected=[view.identifier isEqual:@"appearanceToggle"]&&self.state==NSControlStateValueOn; + DYDrawSoftControl(NSInsetRect(frame,2,3),7,selected,[view.identifier isEqual:@"primaryAction"],self.highlighted); } @end @implementation DYThemeButton + (Class)cellClass {return DYThemeButtonCell.class;} - (void)drawRect:(NSRect)rect { - if(DYThemeUsesRelief()&&[self.identifier isEqual:@"layerAction"])DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted); - if(DYThemeIndex()==6&&[self.identifier isEqual:@"layerAction"]){ - NSBezierPath *plate=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:5 yRadius:5]; - [[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.12:.055]setFill];[plate fill]; - [[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.30:.14]setStroke];plate.lineWidth=.7;[plate stroke]; - } + if([self.identifier isEqual:@"layerAction"])DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted); [super drawRect:rect]; } @end @implementation DYThemePopUpButton - (void)drawRect:(NSRect)rect { - if(DYThemeIndex()<5){[super drawRect:rect];return;} - NSRect bounds=NSInsetRect(self.bounds,1,2);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(self.bounds,2,3),6,NO,NO,self.cell.highlighted);else DYDrawThemeSurface(path,YES); - if(!DYThemeUsesRelief()){[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];} + NSRect bounds=NSInsetRect(self.bounds,2,3);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawSoftControl(bounds,6,NO,NO,self.cell.highlighted); NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45])];NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingTail;attributes[NSParagraphStyleAttributeName]=paragraph; CGFloat y=NSMidY(self.bounds)-(self.font?:[NSFont systemFontOfSize:11]).pointSize*.62; [(self.pullsDown?[self itemAtIndex:0].title:(self.selectedItem.title?:@""))drawInRect:NSMakeRect(9,y,MAX(0,self.bounds.size.width-29),18) withAttributes:attributes]; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 3d44286..c8b119f 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.5 CFBundleVersion - 66 + 67 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 278afca..b54bdce 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.8.5 CFBundleVersion - 66 + 67 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright