feat: pair approved ice-blue UI with obsidian glow relief theme
这个提交包含在:
1 父节点
c6d40d2f4d
当前提交
07a3f7bd4d
7 个文件已更改
+53
-26
没有与搜索条件相匹配的文件
@@ -15,14 +15,14 @@
|
||||
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==8&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
|
||||
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==9&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject 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==8&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
|
||||
for(NSInteger i=0;i<8;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
|
||||
run.record(@"compact-eight-stable-theme-choices",colors);
|
||||
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)});
|
||||
@@ -34,6 +34,13 @@
|
||||
[view performSelector:@selector(themeChanged:) withObject:nil];
|
||||
run.record(@"soft-native-controls-use-light-appearance",[view.appearance.name isEqual:NSAppearanceNameAqua]&&DYThemeTextShadow()==nil);
|
||||
run.record(@"soft-theme-preserves-grade-and-undo",[themeSnapshot isEqual:[view presetSnapshot]]&&themeUndo==host->_undoStarts);
|
||||
DYSetThemeIndex(8);double darkMinimum=100;
|
||||
for(NSString *text in @[@"text",@"secondary",@"slot15",@"accent"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop",@"headerBottom"])
|
||||
darkMinimum=std::min(darkMinimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
|
||||
run.record(@"soft-dark-text-contrast-at-least-4.5",darkMinimum>=4.5,@{@"minimumContrast":@(darkMinimum)});
|
||||
[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);
|
||||
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];
|
||||
|
||||
@@ -84,7 +84,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
|
||||
}
|
||||
- (void)drawBarInside:(NSRect)rect flipped:(BOOL)flipped {
|
||||
NSRect track=NSMakeRect(rect.origin.x,NSMidY(rect)-2.5,rect.size.width,5);
|
||||
if(DYThemeIsLight())DYDrawSoftControl(NSInsetRect(track,-.5,-1),3.5,YES,NO,NO);
|
||||
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(track,-.5,-1),3.5,YES,NO,NO);
|
||||
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);
|
||||
@@ -102,7 +102,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
|
||||
@implementation DYNumberFieldCell
|
||||
- (void)drawWithFrame:(NSRect)frame inView:(NSView *)view {
|
||||
NSRect rect=NSInsetRect(frame,.5,.5);NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.5 yRadius:2.5];
|
||||
if(DYThemeIsLight())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO);
|
||||
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO);
|
||||
else{NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot5"] endingColor:DYThemePalette()[@"slot4"]]autorelease];[gradient drawInBezierPath:p angle:90];[[DYThemePalette()[@"accent"]colorWithAlphaComponent:.65]setStroke];p.lineWidth=.9;[p stroke];}
|
||||
[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@@ -165,7 +165,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
@implementation DYCard
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11];
|
||||
if(DYThemeIsLight())DYDrawSoftControl(NSInsetRect(self.bounds,3,3),12,NO,NO,NO);
|
||||
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(self.bounds,3,3),12,NO,NO,NO);
|
||||
else{DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];path.lineWidth=1;[path stroke];}
|
||||
[(DYThemeIsLight()?DYThemeColor(@"secondary"):[NSColor colorWithWhite:.52 alpha:1])setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
|
||||
}
|
||||
@@ -178,7 +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(DYThemeIsLight()){
|
||||
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;
|
||||
@@ -206,7 +206,7 @@ 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){DYDrawSoftControl(r,5,NO,NO,NO);}
|
||||
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,7 +303,7 @@ static NSArray *DYPresentationSections(void) {
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=[self plotRect];
|
||||
if(DYThemeIsLight())DYDrawSoftControl(r,5,YES,NO,NO);
|
||||
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];}
|
||||
if(_histogramToggle.state==NSControlStateValueOn){
|
||||
const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;
|
||||
@@ -760,7 +760,7 @@ static NSImage *DYWheelImage(void) {
|
||||
[super layout];
|
||||
CGFloat w=MAX(280,self.bounds.size.width),h=self.bounds.size.height;
|
||||
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<380;
|
||||
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*14,17,14,22)];
|
||||
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*12,17,12,22)];
|
||||
_resetAll.frame=NSMakeRect(w-33,16,23,24);
|
||||
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
|
||||
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
|
||||
|
||||
@@ -402,7 +402,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
|
||||
NSMutableDictionary *browserPalette=[NSMutableDictionary dictionaryWithDictionary:palette?:@{}];
|
||||
NSColor *background=[palette[@"background"]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];
|
||||
BOOL light=background&&background.redComponent>.7&&background.greenComponent>.7;
|
||||
if(!light)browserPalette[@"background"]=[NSColor colorWithCalibratedRed:.035 green:.08 blue:.12 alpha:1];
|
||||
// Keep the supplied neutral surface in both relief themes.
|
||||
[_palette release];_palette=[browserPalette copy];_root.palette=_palette;_folderDocument.palette=_palette;_gridDocument.palette=_palette;
|
||||
self.window.backgroundColor=DYBrowserColor(_palette,@"background");self.window.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
|
||||
_root.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
|
||||
|
||||
@@ -8,6 +8,7 @@ FOUNDATION_EXPORT NSDictionary<NSString *, NSColor *> *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.
|
||||
FOUNDATION_EXPORT void DYDrawSoftControl(NSRect rect, CGFloat radius, BOOL recessed, BOOL emphasized, BOOL pressed);
|
||||
|
||||
|
||||
+31
-12
@@ -23,9 +23,9 @@ 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<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变",@"霓虹炫彩",@"冰蓝柔光"];}
|
||||
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<8?i:7;}
|
||||
static const double paletteRGB[8][17][3]={
|
||||
NSArray<NSString *> *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}},
|
||||
@@ -33,18 +33,20 @@ static const double paletteRGB[8][17][3]={
|
||||
{{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}}
|
||||
{{.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[8][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}};index=MAX(0,MIN(7,index));return rgb(values[index][0],values[index][1],values[index][2]);}
|
||||
void DYSetThemeIndex(NSInteger index){if(index<0||index>7)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];}
|
||||
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<NSString *,NSColor *> *DYThemePalette(void){
|
||||
static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{
|
||||
NSMutableArray *all=[NSMutableArray array];
|
||||
for(NSInteger index=0;index<8;index++){
|
||||
for(NSInteger index=0;index<9;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):DYThemeSwatch(index);
|
||||
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);}
|
||||
[all addObject:[[d copy]autorelease]];
|
||||
}palettes=[all copy];
|
||||
});return palettes[DYThemeIndex()];
|
||||
@@ -70,6 +72,7 @@ void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
|
||||
else {[palette[role]setFill];[path fill];}
|
||||
}
|
||||
BOOL DYThemeIsLight(void) {return DYThemeIndex()==7;}
|
||||
BOOL DYThemeUsesRelief(void) {return DYThemeIndex()==7||DYThemeIndex()==8;}
|
||||
// Draw the rim as a filled ring, so the highlight follows the entire rounded
|
||||
// outline rather than glowing around text or requiring additional view layers.
|
||||
static void softGradient(NSBezierPath *path,NSArray *colors) {
|
||||
@@ -82,6 +85,22 @@ static void softGradient(NSBezierPath *path,NSArray *colors) {
|
||||
void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized,BOOL pressed) {
|
||||
BOOL strong=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
|
||||
BOOL quiet=strong||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
|
||||
if(DYThemeIndex()==8){
|
||||
NSBezierPath *shape=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
|
||||
NSColor *top=recessed||pressed?rgb(.045,.05,.065):rgb(.17,.18,.205);
|
||||
NSColor *bottom=recessed||pressed?rgb(.095,.11,.13):rgb(.10,.105,.12);
|
||||
if(emphasized){top=pressed?rgb(.25,.22,.43):rgb(.35,.27,.62);bottom=pressed?rgb(.10,.29,.35):rgb(.12,.40,.48);}
|
||||
if(!quiet&&!recessed&&!pressed){
|
||||
[NSGraphicsContext saveGraphicsState];NSShadow *glow=[[[NSShadow alloc]init]autorelease];
|
||||
glow.shadowColor=[rgb(.36,.72,.83)colorWithAlphaComponent:emphasized?.42:.21];glow.shadowOffset=NSZeroSize;glow.shadowBlurRadius=emphasized?4:3;[glow set];[top setFill];[shape fill];[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
softGradient(shape,@[top,bottom]);
|
||||
NSBezierPath *rim=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];CGFloat width=strong?1.3:1;
|
||||
[rim appendBezierPath:[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect,width,width) xRadius:MAX(0,radius-width) yRadius:MAX(0,radius-width)]];rim.windingRule=NSWindingRuleEvenOdd;
|
||||
if(strong){[rgb(.65,.79,.88)setFill];[rim fill];}
|
||||
else softGradient(rim,recessed||pressed?@[rgb(.15,.22,.29),rgb(.41,.59,.69)]:@[rgb(.70,.82,.91),rgb(.28,.40,.51),rgb(.16,.24,.29),rgb(.38,.53,.61)]);
|
||||
return;
|
||||
}
|
||||
NSBezierPath *shape=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
|
||||
NSColor *top=recessed||pressed?rgb(.79,.87,.93):rgb(.96,.985,1);
|
||||
NSColor *bottom=recessed||pressed?rgb(.91,.96,.99):rgb(.85,.92,.97);
|
||||
@@ -114,14 +133,14 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized,
|
||||
}
|
||||
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view {
|
||||
if(DYThemeIndex()<5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
|
||||
if(DYThemeIsLight()){DYDrawSoftControl(NSInsetRect(frame,2,3),7,NO,[view.identifier isEqual:@"primaryAction"],self.highlighted);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];
|
||||
}
|
||||
@end
|
||||
@implementation DYThemeButton
|
||||
+ (Class)cellClass {return DYThemeButtonCell.class;}
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
if(DYThemeIsLight()&&[self.identifier isEqual:@"layerAction"])DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted);
|
||||
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];
|
||||
@@ -133,8 +152,8 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized,
|
||||
@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(DYThemeIsLight())DYDrawSoftControl(NSInsetRect(self.bounds,2,3),6,NO,NO,self.cell.highlighted);else DYDrawThemeSurface(path,YES);
|
||||
if(!DYThemeIsLight()){[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];}
|
||||
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];}
|
||||
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];
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.5</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>65</string>
|
||||
<string>66</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.5</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>65</string>
|
||||
<string>66</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户