feat: emphasize module headers and layer actions on the approved dark base
这个提交包含在:
1 父节点
2ba0a415ae
当前提交
55b66a358c
5 个文件已更改
+33
-8
没有与搜索条件相匹配的文件
@@ -0,0 +1,9 @@
|
||||
大鱼调色 1.8.4(64)公测
|
||||
|
||||
重新收敛“霓虹炫彩”配色。移除各模块独立的红、绿、橙等高饱和色块,卡片和标题统一为接近黑色、轻微暖紫倾向的低饱和表面,图标使用统一的柔和银灰紫色。使用者认可的“保存预设”按钮继续保留原有粉紫到青色渐变,渐变强调集中在主按钮、滑杆和顶部细线。
|
||||
|
||||
在用户认可的近黑底色上,模块名称按钮以统一的轻粉青渐变、细边及更亮展开态强化显示;蒙版、删除、再加一层按钮增加低对比按钮底与清晰图标。
|
||||
|
||||
不改变现有功能、参数、色彩管理、模板或直方图算法。亮度/RGB直方图继续使用320×180分析画面、256档、最多2Hz刷新,支持单通道与显隐;仍不是最终输出或HDR示波器。
|
||||
|
||||
适用Apple Silicon,macOS14.6或更新。唯一正式安装 /Library/Plug-Ins/FxPlug/大鱼调色.app。验证和发行摘要在正式验收后补齐。
|
||||
+14
-6
@@ -174,8 +174,16 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
|
||||
@implementation DYHeader
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
NSRect r=NSInsetRect(self.bounds,.5,2);
|
||||
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];
|
||||
[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:r xRadius:8 yRadius:8] angle:90];
|
||||
NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7];
|
||||
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];
|
||||
}
|
||||
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];
|
||||
@@ -569,7 +577,7 @@ static NSImage *DYWheelImage(void) {
|
||||
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
|
||||
- (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; }
|
||||
- (void)themeChanged:(NSNotification *)notification {
|
||||
for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYThemeColor(@"secondary"):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
|
||||
for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYThemeColor(@"slot15"):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
|
||||
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
|
||||
for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff;
|
||||
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease];
|
||||
@@ -699,10 +707,10 @@ static NSImage *DYWheelImage(void) {
|
||||
id<PROAPIAccessing> host=_embedded?[(DYToolManager*)_manager host]:_manager;
|
||||
NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:key];
|
||||
DYToolMaskPanel *maskPanel=[[[DYToolMaskPanel alloc]initWithManager:host nodeID:nodeID]autorelease];[card addSubview:maskPanel];[body insertObject:maskPanel atIndex:0];record[@"maskPanel"]=maskPanel;
|
||||
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
|
||||
NSButton *mask=DYButton(@"",self,@selector(toolMask:));mask.tag=index;mask.bordered=NO;mask.identifier=@"layerAction";mask.image=[NSImage imageWithSystemSymbolName:@"circle.dashed.inset.filled" accessibilityDescription:@"添加蒙版"];mask.toolTip=@"添加本工具的独立蒙版";mask.accessibilityLabel=[section[@"title"]stringByAppendingString:@"添加蒙版"];[card addSubview:mask];record[@"maskButton"]=mask;
|
||||
DYMaskCountBadge *maskBadge=[[[DYMaskCountBadge alloc]initWithFrame:NSZeroRect]autorelease];maskBadge.hidden=YES;maskBadge.accessibilityLabel=[section[@"title"] stringByAppendingString:@"蒙版数量"];[card addSubview:maskBadge];record[@"maskBadge"]=maskBadge;
|
||||
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
|
||||
NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove;
|
||||
NSButton *repeat=DYButton(@"",self,@selector(repeatTool:));repeat.tag=index;repeat.bordered=NO;repeat.identifier=@"layerAction";repeat.image=[NSImage imageWithSystemSymbolName:@"plus.square.on.square" accessibilityDescription:@"再加一层"];repeat.toolTip=@"紧接当前工具插入一层初始化工具";repeat.accessibilityLabel=[section[@"title"]stringByAppendingString:@"再加一层"];[card addSubview:repeat];record[@"repeatButton"]=repeat;
|
||||
NSButton *remove=DYButton(@"",self,@selector(removeTool:));remove.tag=index;remove.bordered=NO;remove.identifier=@"layerAction";remove.image=[NSImage imageWithSystemSymbolName:@"minus.square" accessibilityDescription:@"删除此层"];remove.toolTip=@"删除此层并还原参数、LUT 与蒙版";remove.accessibilityLabel=[section[@"title"]stringByAppendingString:_embedded?@"删除此层":@"删除模块"];[card addSubview:remove];record[@"removeButton"]=remove;
|
||||
[_cards addObject:record];
|
||||
index++;
|
||||
}
|
||||
|
||||
@@ -83,6 +83,14 @@ void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
|
||||
@end
|
||||
@implementation DYThemeButton
|
||||
+ (Class)cellClass {return DYThemeButtonCell.class;}
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
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];
|
||||
}
|
||||
[super drawRect:rect];
|
||||
}
|
||||
@end
|
||||
@implementation DYThemePopUpButton
|
||||
- (void)drawRect:(NSRect)rect {
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.4</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>63</string>
|
||||
<string>64</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string></string>
|
||||
<key>PlugInKit</key>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.8.4</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>63</string>
|
||||
<string>64</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户