From 1396d5b7bf85175ab5c34328406ada148f6c79bb Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 09:48:46 +0800 Subject: [PATCH] wip: replace workspace tabs with horizontal layer-driven editing and persistent four-up scopes --- research/UnifiedWorkspace-20261105.md | 6 + verification/DYScopeMathDiagnostics.cpp | 6 +- 大鱼调色/Plugin/DYColorWorkspace.mm | 112 +++++++++--------- 大鱼调色/Plugin/DYInspector.h | 1 + 大鱼调色/Plugin/DYInspector.mm | 37 ++++-- 大鱼调色/Plugin/DYLUTBrowser.mm | 9 +- 大鱼调色/Plugin/DYMaskPanel.inc.h | 30 +++-- 大鱼调色/Plugin/DYNewPanels.inc.h | 5 +- 大鱼调色/Plugin/DYPlugIn.mm | 9 +- 大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h | 4 +- 大鱼调色/Plugin/DYTheme.h | 1 + 大鱼调色/Plugin/DYTheme.mm | 7 +- 大鱼调色/Plugin/DYToolHostMethods.inc.h | 2 +- 大鱼调色/Plugin/DYToolInspector.inc.h | 2 +- 大鱼调色/Plugin/DYToolPenDiagnostics.inc.h | 7 ++ .../Plugin/DYWorkspaceDiagnosticHost.inc.h | 6 +- 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 46 ++++--- 大鱼调色/Plugin/DYWorkspaceTools.inc.h | 64 ++++++---- 18 files changed, 207 insertions(+), 147 deletions(-) diff --git a/research/UnifiedWorkspace-20261105.md b/research/UnifiedWorkspace-20261105.md index 5732b92..4bac6d7 100644 --- a/research/UnifiedWorkspace-20261105.md +++ b/research/UnifiedWorkspace-20261105.md @@ -54,3 +54,9 @@ OpenCV4.5.1由官方锁定源码静态构建并随包保留全部许可,宿主 最终编译源码226b7e1e93dfd5fa2ee2f002fdc828077a2f7f46已完成Release、逐层正式签名、公证b666b44e-83d3-4edd-88e7-f0c5cf83f8ce Accepted、票据、Gatekeeper、唯一正式安装、PluginKit及正式安装787项检查。再次进入FCP实测时系统报告Mac锁屏,不能自动解锁;已请求用户手动解锁,未绕过锁屏。最终候选宿主验收、PKG和Release尚未完成;旧恢复APP保留。详情在verification/HostUnifiedWorkspace1.12.0.json。 远端独立恢复已验证577个编译节点文件逐字节相同、full/strict fsck、8个色彩依赖源包及官方OpenCV源包锁。后续发行标签仍需单独核验。新增同素材ColorFinale参考项目的XML只引用本机原生效果路径,不复制商业模板或代码;严格DTD/媒体验证通过,尚未导入宿主。 + +### 2026-11-05 主检视器空白的现场记录 + +用户实测截图显示 FCP 自定义视图空白。系统日志在 09:43:55 记录 `Unable to create custom view`,FxPlugErrorDomain=16;本机 SDK FxTypes.h 将 16 定义为 `kFxError_PluginNotFound`。现场未发现本次 1.12.0 正式服务的对应崩溃报告,不能把既有 1.10.0 的诊断崩溃当成本次证据。后台完整 APP 编译会执行 `RegisterWithLaunchServices`,临时构建副本进入 PluginKit,可能干扰宿主插件重连;已移除构建副本登记。用户测试期间只编译 XPC 目标并核验不会执行 LaunchServices 登记,最终完整构建必须宿主正常退出后进行。参数回调改为每个待处理主队列批次只发一次模型更新,避免一个事务数百次视图刷新;需要正式版重复切换与重开验证,暂不宣称空白故障根因已完全解决。 + +四宫格第四项采用显示参考 RGB 的 BT.709 色差坐标,计算来源为 [ITU-R BT.709-6 第 3.3 节](https://www.itu.int/dms_pubrec/itu-r/rec/bt/r-rec-bt.709-6-201506-i%21%21pdf-e.pdf)。保持现有显示参考采样边界,不把它标为精密 HDR/IRE 测量。 diff --git a/verification/DYScopeMathDiagnostics.cpp b/verification/DYScopeMathDiagnostics.cpp index 18e3f83..a0a2da5 100644 --- a/verification/DYScopeMathDiagnostics.cpp +++ b/verification/DYScopeMathDiagnostics.cpp @@ -7,5 +7,9 @@ int main(){ assert(r.histogram[bin(.2126f)]==1);assert(r.histogram[bin(.7152f)]==1);assert(r.histogram[bin(.0722f)]==1);assert(r.wave[(Bins-1-bin(.2126f))*Width]==1); assert(bin(-100)==0&&bin(100)==Bins-1);assert(bin(std::numeric_limits::max())==Bins-1&&bin(-std::numeric_limits::max())==0);auto im=densityImage(r.wave,false);assert(im.size()==size_t(Width)*Bins*4);assert(im[((Bins-1-bin(.2126f))*Width)*4]>0); auto rgb=densityImage(r.parade,true);assert(rgb.size()==size_t(3)*Width*Bins*4);assert(rgb[(Bins-1-bin(1.f))*3*Width*4]>0); - assert(measure(pixels,0,0).valid==0);return 0; + assert(measure(pixels,0,0).valid==0); + RGBA colors[]={{.5f,.5f,.5f,1},{1,0,0,1},{1,0,1,1},{0,0,1,1},{0,1,1,1},{0,1,0,1},{1,1,0,1},{2,2,2,0},{INFINITY,0,0,1}}; + auto v=measure(colors,9,1);uint64_t total=0;for(auto n:v.vectors)total+=n;assert(total==7&&v.transparent==1&&v.nonfinite==1);assert(v.vectors[(Bins-1-chromaBin(0))*Bins+chromaBin(0)]==1); + for(unsigned i=1;i<7;i++){auto p=colors[i];float y=.2126f*p.r+.7152f*p.g+.0722f*p.b;unsigned x=chromaBin((p.b-y)/1.8556f),row=Bins-1-chromaBin((p.r-y)/1.5748f);assert(v.vectors[row*Bins+x]==1);} + auto vector=vectorImage(v.vectors);assert(vector.size()==Bins*Bins*4);assert(vectorImage({}).empty());for(size_t i=0;i static NSButton *DYWorkspaceButton(NSString *title,id target,SEL action){NSButton *b=[NSButton buttonWithTitle:title target:target action:action];b.bezelStyle=NSBezelStyleRounded;b.bordered=NO;b.font=[NSFont systemFontOfSize:11];b.accessibilityLabel=title;return b;} +static NSString *DYWorkspaceSymbol(NSString *type){return @{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"}[type]?:@"square";} +static NSDictionary *DYWorkspacePalette(void){NSMutableDictionary *palette=[[DYThemePalette()mutableCopy]autorelease];BOOL light=DYThemeIsLight();palette[@"background"]=[NSColor colorWithWhite:light?.88:.145 alpha:1];palette[@"card"]=[NSColor colorWithWhite:light?.84:.17 alpha:1];palette[@"field"]=[NSColor colorWithWhite:light?.78:.23 alpha:1];palette[@"border"]=[NSColor colorWithWhite:light?.6:.31 alpha:1];return palette;} static NSDictionary *DYWorkspaceSection(NSString *type){NSMutableDictionary *section=[[DYToolSection(type)mutableCopy]autorelease];if([type isEqual:@"base"])section[@"extraEnabled"]=DYToolSection(@"color")[@"enabled"];if([type isEqual:@"primary"]){for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:@"primaryMasterEnabled"])section[@"enabled"]=d[@"pid"];section[@"enableParameters"]=@[DYToolSection(@"input")[@"enabled"],DYToolSection(@"primary")[@"enabled"],DYToolSection(@"output")[@"enabled"]];}return section;} static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"base"])return u.baseSectionEnabled>.5||u.colorSectionEnabled>.5;if([type isEqual:@"primary"])return u.primarySectionEnabled>.5;for(NSDictionary*d in DYDescriptors())if([d[@"pid"]isEqual:DYToolSection(type)[@"enabled"]]&&[d[@"offset"]integerValue]>=0)return *(float*)((uint8_t*)&u+[d[@"offset"]unsignedIntegerValue])>.5;return YES;} @interface DYWorkspaceList:NSView @end @@ -18,9 +20,16 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b @end @interface DYWorkspaceCell:NSTableCellView @property(nonatomic,assign) NSButton *bypass; +@property(nonatomic,assign) NSButton *maskButton; +@property(nonatomic,assign) NSImageView *glyph; @end @implementation DYWorkspaceCell -- (void)resizeSubviewsWithOldSize:(NSSize)old{[super resizeSubviewsWithOldSize:old];CGFloat w=self.bounds.size.width;self.textField.frame=NSMakeRect(8,5,MAX(1,w-46),20);_bypass.frame=NSMakeRect(MAX(0,w-32),2,26,26);} +- (void)resizeSubviewsWithOldSize:(NSSize)old{[super resizeSubviewsWithOldSize:old];CGFloat w=self.bounds.size.width;self.textField.frame=NSMakeRect(31,4,MAX(1,w-(_maskButton?91:65)),20);_glyph.frame=NSMakeRect(9,7,15,15);_maskButton.frame=NSMakeRect(MAX(0,w-55),2,24,24);_bypass.frame=NSMakeRect(MAX(0,w-29),2,24,24);} +@end +@interface DYWorkspaceRow:NSTableRowView @end +@implementation DYWorkspaceRow +- (void)drawSelectionInRect:(NSRect)dirty{[[NSColor colorWithRed:.23 green:.28 blue:.49 alpha:1]setFill];NSRectFill(self.bounds);} +- (void)drawSeparatorInRect:(NSRect)dirty{[[NSColor colorWithWhite:.23 alpha:1]setFill];NSRectFill(NSMakeRect(0,NSMaxY(self.bounds)-.5,self.bounds.size.width,.5));} @end @class DYWorkspaceRoot; @@ -39,45 +48,36 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b - (instancetype)initWithFrame:(NSRect)frame{if((self=[super initWithFrame:frame]))self.clipsToBounds=YES;return self;} - (BOOL)isFlipped{return YES;} - (BOOL)isOpaque{return YES;} -- (void)drawRect:(NSRect)dirty{[DYThemeColor(@"background")setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));} +- (void)drawRect:(NSRect)dirty{[[NSColor colorWithWhite:DYThemeIsLight()?.88:.145 alpha:1]setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));} - (void)resizeSubviewsWithOldSize:(NSSize)old{[super resizeSubviewsWithOldSize:old];[_owner layoutWorkspace];} @end @interface DYScopePlot:NSView @property(nonatomic,copy) NSDictionary *metadata; @property(nonatomic) NSInteger mode; @end -@implementation DYScopePlot { - NSImage *_wave,*_parade; -} +@implementation DYScopePlot {NSImage *_raster;} - (BOOL)isFlipped{return YES;} - (BOOL)isOpaque{return YES;} -- (void)dealloc{[_metadata release];[_wave release];[_parade release];[super dealloc];} -- (NSImage *)imageForData:(NSData *)data width:(NSUInteger)width{ - if(data.length!=width*dyscope::Bins*4)return nil; - NSBitmapImageRep *rep=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil pixelsWide:width pixelsHigh:dyscope::Bins bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:width*4 bitsPerPixel:32]autorelease]; - if(!rep)return nil;memcpy(rep.bitmapData,data.bytes,data.length);NSImage *image=[[[NSImage alloc]initWithSize:NSMakeSize(width,dyscope::Bins)]autorelease];[image addRepresentation:rep];return image; +- (void)dealloc{[_metadata release];[_raster release];[super dealloc];} +- (NSString*)scopeTitle{return @[@"亮度波形",@"RGB 分列",@"直方图",@"矢量图"][_mode];} +- (void)setMetadata:(NSDictionary*)data{ + if(_metadata==data)return;[_metadata release];_metadata=[data copy];[_raster release];_raster=nil; + NSString *key=_mode==0?@"waveform":_mode==1?@"parade":@"vectorscope";NSUInteger width=_mode==0?dyscope::Width:_mode==1?3*dyscope::Width:dyscope::Bins;NSData *bytes=_mode==2?nil:data[key]; + if(bytes.length==width*dyscope::Bins*4){NSBitmapImageRep *rep=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil pixelsWide:width pixelsHigh:dyscope::Bins bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:width*4 bitsPerPixel:32]autorelease];memcpy(rep.bitmapData,bytes.bytes,bytes.length);_raster=[[NSImage alloc]initWithSize:NSMakeSize(width,dyscope::Bins)];[_raster addRepresentation:rep];} + self.accessibilityLabel=[NSString stringWithFormat:@"%@ · %@ · 有效取样 %@",self.scopeTitle,data[@"domain"]?:@"等待画面",data[@"valid"]?:@0];[self setNeedsDisplay:YES]; } -- (void)setMetadata:(NSDictionary *)metadata{ - if(_metadata==metadata)return;[_metadata release];_metadata=[metadata copy];[_wave release];_wave=[[self imageForData:metadata[@"waveform"] width:dyscope::Width]retain];[_parade release];_parade=[[self imageForData:metadata[@"parade"] width:3*dyscope::Width]retain]; - self.accessibilityLabel=[NSString stringWithFormat:@"%@,有效取样 %@,低于显示范围 %@,高于显示范围 %@",metadata[@"domain"]?:@"等待最终输出",metadata[@"valid"]?:@0,metadata[@"below"]?:@0,metadata[@"above"]?:@0];[self setNeedsDisplay:YES]; -} -- (void)setMode:(NSInteger)mode{_mode=mode;[self setNeedsDisplay:YES];} - (void)drawRect:(NSRect)dirty{ - [[NSColor colorWithCalibratedWhite:.025 alpha:1]setFill];NSRectFill(self.bounds); - NSRect plot=NSMakeRect(48,24,MAX(1,self.bounds.size.width-66),MAX(1,self.bounds.size.height-52)); - NSDictionary *text=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular],NSForegroundColorAttributeName:[NSColor colorWithWhite:.64 alpha:1]}; - if(_mode<2){NSImage *image=_mode==1?_parade:_wave;[NSGraphicsContext saveGraphicsState];NSGraphicsContext.currentContext.imageInterpolation=NSImageInterpolationNone;[image drawInRect:plot fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];[NSGraphicsContext restoreGraphicsState]; - for(int percent : {-10,0,25,50,75,100,110}){CGFloat y=NSMaxY(plot)-(percent+10)/120.0*plot.size.height;[[NSColor colorWithWhite:(percent==0||percent==100)?.48:.3 alpha:.55]setStroke];NSBezierPath *line=[NSBezierPath bezierPath];[line moveToPoint:NSMakePoint(plot.origin.x,y)];[line lineToPoint:NSMakePoint(NSMaxX(plot),y)];[line stroke];[[NSString stringWithFormat:@"%d%%",percent]drawAtPoint:NSMakePoint(5,y-6) withAttributes:text];} - if(_mode==1){for(int i=0;i<3;i++){CGFloat x=plot.origin.x+i*plot.size.width/3;[[@[@"R",@"G",@"B"]objectAtIndex:i]drawAtPoint:NSMakePoint(x+8,NSMaxY(plot)+7) withAttributes:text];if(i){[[NSColor colorWithWhite:.4 alpha:.6]setStroke];NSBezierPath *p=[NSBezierPath bezierPath];[p moveToPoint:NSMakePoint(x,plot.origin.y)];[p lineToPoint:NSMakePoint(x,NSMaxY(plot))];[p stroke];}}} - else [@"画面横向位置" drawAtPoint:NSMakePoint(plot.origin.x,NSMaxY(plot)+7) withAttributes:text]; - }else{ - NSData *hist=_metadata[@"histogram"];if(hist.length==4*dyscope::Bins*sizeof(uint32_t)){ - const auto *bins=(const uint32_t*)hist.bytes;uint32_t maximum=1;for(unsigned i=0;i<4*dyscope::Bins;i++)maximum=std::max(maximum,bins[i]); - NSArray *colors=@[[NSColor colorWithWhite:.82 alpha:.8],NSColor.systemRedColor,NSColor.systemGreenColor,NSColor.systemBlueColor]; - for(unsigned c=0;c<4;c++){[colors[c]setStroke];NSBezierPath *line=[NSBezierPath bezierPath];for(unsigned b=0;b _manager; DYRenderer *_renderer;DYLUTLibrary *_library;DYLUTBrowser *_browser; DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane; - DYScopePlot *_plot; + DYScopePlot *_plot;NSArray *_scopePlots;NSInteger _editorMode; NSTextField *_heading,*_description,*_status,*_lutExplanation; - NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes,*_sizeMode; + NSButton *_close,*_hostScopes,*_sizeMode; DYWorkspaceLifetime *_lifetime; NSProgress *_selectionTask; NSView *_remoteParent;NSWindow *_presentationWindow; @@ -98,7 +98,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView *_maskEditor; NSTextField *_selectionTitle;NSButton *_addMask,*_deleteLayer; NSArray *_layerRows;NSDictionary *_toolDocument;NSString *_selectedNode,*_selectedMask,*_maskNode,*_editorNode; - id _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit,_hasUserSelection;CGFloat _splitFraction; + id _lutTarget;CMTime _toolTime;BOOL _refreshingStack,_sizingSplit,_hasUserSelection;CGFloat _splitFraction,_scopeFraction; } @end @implementation DYColorWorkspace @@ -108,14 +108,13 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b _manager=[manager retain];_renderer=[renderer retain];_library=[library retain];_title=[(title.length?title:@"大鱼调色")copy];_lifetime=[DYWorkspaceLifetime new];_lifetime.owner=self; _root=[[DYWorkspaceRoot alloc]initWithFrame:NSMakeRect(0,0,1120,360)];_root.identifier=@"DYColorWorkspace";_root.owner=self;_root.accessibilityLabel=@"大鱼调色控制面板"; _heading=[[DYThemeLabel labelWithString:@""]retain];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading]; - _pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=4;for(NSInteger i=0;i<4;i++)[_pages setLabel:@[@"调整",@"蒙版",@"LUT",@"示波器"][i]forSegment:i];_pages.selectedSegment=0;_pages.target=self;_pages.action=@selector(pageChanged:);_pages.accessibilityLabel=@"控制面板页面";[_root addSubview:_pages]; - _close=[[DYThemeButton alloc]init];_close.title=@"关闭";_close.target=self;_close.action=@selector(closePressed:);_close.bezelStyle=NSBezelStyleRounded;[_root addSubview:_close]; + _heading.hidden=YES; + _close=[DYWorkspaceButton(@"关闭",self,@selector(closePressed:))retain];_close.title=@"";_close.image=[NSImage imageWithSystemSymbolName:@"xmark" accessibilityDescription:@"关闭控制面板"];_close.imagePosition=NSImageOnly;[_root addSubview:_close]; _sizeMode=[DYWorkspaceButton(@"",self,@selector(toggleWorkspaceSize:))retain];_sizeMode.imagePosition=NSImageOnly;[_root addSubview:_sizeMode]; _scopePane=[[DYWorkspaceRoot alloc]init];_scopePane.clipsToBounds=YES;[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES; - _scopeMode=[[DYThemePopUpButton alloc]init];[_scopeMode addItemsWithTitles:@[@"亮度波形",@"RGB 分列",@"直方图"]];_scopeMode.target=self;_scopeMode.action=@selector(scopeModeChanged:);_scopeMode.accessibilityLabel=@"示波器类型";[_scopePane addSubview:_scopeMode]; - _hostScopes=[[DYThemeButton alloc]init];_hostScopes.title=@"FCP 示波器";_hostScopes.bezelStyle=NSBezelStyleRounded;_hostScopes.target=self;_hostScopes.action=@selector(toggleHostScopes:);_hostScopes.toolTip=@"打开或关闭 Final Cut Pro 自带的视频示波器;下方是大鱼的显示参考示波器";[_scopePane addSubview:_hostScopes]; - _description=[[DYThemeLabel labelWithString:@""]retain];_description.font=[NSFont systemFontOfSize:11];[_scopePane addSubview:_description]; - _plot=[[DYScopePlot alloc]init];_plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:_plot]; + _hostScopes=[DYWorkspaceButton(@"FCP",self,@selector(toggleHostScopes:))retain];_hostScopes.toolTip=@"切换宿主示波器";[_scopePane addSubview:_hostScopes]; + _description=[[DYThemeLabel labelWithString:@"示波器 · 显示参考"]retain];_description.font=[NSFont systemFontOfSize:10];[_scopePane addSubview:_description]; + NSMutableArray *plots=[NSMutableArray array];for(NSInteger i=0;i<4;i++){DYScopePlot *plot=[[[DYScopePlot alloc]init]autorelease];plot.mode=i;plot.accessibilityRole=NSAccessibilityImageRole;[_scopePane addSubview:plot];[plots addObject:plot];}_scopePlots=[plots copy];_plot=[_scopePlots[0]retain]; _status=[[DYThemeLabel labelWithString:@""]retain];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[_scopePane addSubview:_status]; _lutExplanation=[[DYThemeLabel labelWithString:@""]retain];_lutExplanation.font=[NSFont systemFontOfSize:11];_lutExplanation.stringValue=[NSString stringWithFormat:@"应用位置:%@ · 风格1。缩略图以输入画面预览;示波器查看最终调色结果。",_title];[_root addSubview:_lutExplanation];_lutExplanation.hidden=YES; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(scopeChanged:) name:@"DYScopeDidChange" object:_renderer]; @@ -127,7 +126,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)dealloc{ [self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil; - [_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release]; + [_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_scopePlots release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release]; [_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc]; } - (BOOL)visible{return _visible||_opening;} @@ -150,7 +149,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b };if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);}; // FCP initially uses the requested maximum. Keep the default a narrow strip; // larger LUT/mask layouts are an explicit choice, without moving host windows. - if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(720,300) maximumSize:_expanded?NSMakeSize(2400,1200):NSMakeSize(1440,360) reply:reply]; + if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(840,300) maximumSize:_expanded?NSMakeSize(2400,1200):NSMakeSize(1440,360) reply:reply]; else if(remote)[remote remoteWindowOfSize:NSMakeSize(1120,360) reply:reply]; else{_opening=NO;[self reportError:@"当前宿主未提供外部工具窗口接口"];} }@finally{[action endAction:self];} @@ -172,44 +171,41 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b } - (void)layoutWorkspace{ CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; - _heading.frame=NSMakeRect(12,9,MAX(100,w-466),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-434),7,306,27);_sizeMode.frame=NSMakeRect(MAX(0,w-120),7,28,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27); + _heading.hidden=YES;_toolbarScroll.frame=NSMakeRect(6,3,MAX(1,w-78),30);_sizeMode.frame=NSMakeRect(MAX(0,w-68),3,26,27);_close.frame=NSMakeRect(MAX(0,w-34),3,26,27); _sizeMode.image=[NSImage imageWithSystemSymbolName:_expanded?@"arrow.down.right.and.arrow.up.left":@"arrow.up.left.and.arrow.down.right" accessibilityDescription:_expanded?@"收为窄条":@"扩大工作区"];_sizeMode.accessibilityLabel=_expanded?@"收为窄条":@"扩大工作区";_sizeMode.toolTip=_sizeMode.accessibilityLabel;_sizeMode.contentTintColor=DYThemeColor(@"text"); - _toolbarScroll.frame=NSMakeRect(8,39,MAX(1,w-16),40); - _sizingSplit=YES;_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));_sizingSplit=NO;[self layoutToolWorkspace]; - _scopePane.frame=_editorHost.bounds;_lutPane.frame=NSMakeRect(0,25,_editorHost.bounds.size.width,MAX(1,_editorHost.bounds.size.height-25));_lutExplanation.frame=NSMakeRect(8,2,MAX(1,_editorHost.bounds.size.width-16),22); - w=_scopePane.bounds.size.width; - CGFloat ph=_scopePane.bounds.size.height;_scopeMode.frame=NSMakeRect(18,0,160,27);_hostScopes.frame=NSMakeRect(184,0,122,27);_description.frame=NSMakeRect(320,4,MAX(1,w-338),22);_plot.frame=NSMakeRect(18,39,MAX(1,w-36),MAX(1,ph-114));_status.frame=NSMakeRect(18,MAX(40,ph-64),MAX(1,w-36),58); + _sizingSplit=YES;_split.frame=NSMakeRect(0,36,w,MAX(1,h-36));_sizingSplit=NO;[self layoutToolWorkspace]; + _lutPane.frame=_editorHost.bounds;_lutExplanation.hidden=YES; + CGFloat sw=_scopePane.bounds.size.width,sh=_scopePane.bounds.size.height;_description.frame=NSMakeRect(8,3,MAX(1,sw-50),19);_hostScopes.frame=NSMakeRect(sw-40,1,34,21);_status.hidden=YES; + CGFloat gap=4,pw=MAX(1,(sw-12-gap)/2),ph=MAX(1,(sh-30-gap)/2);for(NSUInteger i=0;i<_scopePlots.count;i++)[_scopePlots[i]setFrame:NSMakeRect(6+(i%2)*(pw+gap),26+(i/2)*(ph+gap),pw,ph)]; } - (void)pageChanged:(id)sender{ - if(_pages.selectedSegment==2)[self bindLUTTarget]; - NSInteger page=_pages.selectedSegment;_scopePane.hidden=page!=3;_lutPane.hidden=page!=2;_lutExplanation.hidden=page!=2;_toolEditor.hidden=page!=0;_maskPane.hidden=page!=1; - _selectionTitle.hidden=page>1; - [_renderer setScopeEnabled:_visible&&page==3];if(page==2)[self ensureBrowser];if(page==3)[self scopeChanged:nil];[self layoutWorkspace]; + if(_editorMode==2)[self bindLUTTarget];_scopePane.hidden=NO;_lutPane.hidden=_editorMode!=2;_lutExplanation.hidden=YES;_toolEditor.hidden=_editorMode!=0;_maskPane.hidden=_editorMode!=1;_selectionTitle.hidden=_editorMode==2; + [_renderer setScopeEnabled:_visible];if(_editorMode==2)[self ensureBrowser];[self scopeChanged:nil];[self layoutWorkspace]; } - (void)toggleHostScopes:(id)sender{ id action=[self actionAPI];NSError *error=nil;BOOL done=NO;if(action){[action startAction:self];@try{id commands=[_manager apiForProtocol:@protocol(FxCommandAPI)];done=[commands performCommand:kFxCommand_ToggleWaveforms error:&error];}@finally{[action endAction:self];}} if(!done)[self reportError:error.localizedDescription?:@"当前宿主无法切换 FCP 示波器"]; } -- (void)scopeModeChanged:(id)sender{_plot.mode=_scopeMode.indexOfSelectedItem;} + - (void)scopeChanged:(NSNotification *)notification{ - if(notification&&!_visible)return;NSDictionary *data=[_renderer scopeMetadata];_plot.metadata=data; + if(notification&&!_visible)return;NSDictionary *data=[_renderer scopeMetadata];for(DYScopePlot *plot in _scopePlots)plot.metadata=data; _description.toolTip=data?[NSString stringWithFormat:@"宿主输出配置:%@\n%@",data[@"source"],data[@"note"]]:nil; - _description.stringValue=data?[NSString stringWithFormat:@"%@ · %@ · 320 × 180",data[@"domain"],data[@"region"]]:@"最终输出 · 等待宿主渲染"; + _description.stringValue=data?data[@"domain"]:@"示波器 · 显示参考";for(DYScopePlot *plot in _scopePlots)plot.toolTip=data[@"note"]?:@"当前效果最终输出 · 显示参考"; if(data){double t=[data[@"time"]doubleValue];NSString *frame=std::isfinite(t)?[NSString stringWithFormat:@"%.3f 秒",t]:@"静帧"; _status.stringValue=[NSString stringWithFormat:@"%@\n%@ · 有效 %@ · 透明 %@ · 非有限 %@ · 超出 −10%%/110%% %@/%@",([data[@"converted"]boolValue]?@"最终画面 · sRGB 显示参考;非 HDR / IRE 精密测量":@"空间未知:显示宿主 RGB 数值参考;不用于 HDR / IRE 测量"),frame,data[@"valid"],data[@"transparent"],data[@"nonfinite"],data[@"below"],data[@"above"]]; }else _status.stringValue=@"示波器采集当前效果的最终输出。播放、移动时间线或调整颜色后更新;透明像素不计入。"; } -- (void)previewChanged:(NSNotification *)notification{if(_visible&&_pages.selectedSegment==2)[_browser updatePreview:[_renderer lookLUTPreview]];} +- (void)previewChanged:(NSNotification *)notification{if(_visible&&_editorMode==2)[_browser updatePreview:[_renderer lookLUTPreview]];} - (void)themeChanged:(NSNotification *)notification{[self updatePalette];} - (void)updatePalette{ - [_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYThemePalette()]; + [_root setNeedsDisplay:YES];for(NSTextField *label in @[_heading,_description,_status,_lutExplanation])label.textColor=DYThemeColor(label==_heading?@"text":@"secondary");[_browser updatePalette:DYWorkspacePalette()]; } - (void)ensureBrowser{ if(_browser.visible)return;[_browser release];_browser=nil;id action=[[self lutManager] apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!action){[self reportError:@"宿主暂时无法读取风格1"];return;} NSString *selected=nil;[action startAction:self];@try{selected=[DYReadAssets([self lutManager],action.currentTime).paths[@"look0"]copy];}@finally{[action endAction:self];} DYWorkspaceLifetime *token=_lifetime; - _browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYThemePalette() selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closed)return [owner selectLUT:path completion:completion];if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return nil;}];[selected release]; - [_browser embedInView:_lutPane close:^{DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closing&&!owner->_closed){owner->_pages.selectedSegment=0;[owner pageChanged:nil];}}]; + _browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYWorkspacePalette() selection:^NSProgress *(NSString *path,void(^completion)(NSError *)){DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closed)return [owner selectLUT:path completion:completion];if(completion)completion([NSError errorWithDomain:NSCocoaErrorDomain code:NSUserCancelledError userInfo:nil]);return nil;}];[selected release]; + [_browser embedInView:_lutPane close:^{DYColorWorkspace *owner=token.owner;if(owner&&!owner->_closing&&!owner->_closed){owner->_editorMode=0;[owner pageChanged:nil];}}]; } - (NSDictionary *)selectionContextAtTime:(CMTime)time{ id host=[[self lutManager] isKindOfClass:DYToolManager.class]?[(DYToolManager*)[self lutManager] host]:[self lutManager]; diff --git a/大鱼调色/Plugin/DYInspector.h b/大鱼调色/Plugin/DYInspector.h index 137b900..3890688 100644 --- a/大鱼调色/Plugin/DYInspector.h +++ b/大鱼调色/Plugin/DYInspector.h @@ -5,6 +5,7 @@ @protocol DYWorkspaceMaskEditing @property(nonatomic) BOOL workspaceMode; @property(nonatomic,readonly) CGFloat contentHeight; +@property(nonatomic,readonly) CGFloat contentWidth; @property(nonatomic,readonly) NSString *selectedMaskID; - (void)refreshWithDocument:(NSDictionary *)document time:(CMTime)time; - (void)addMenu:(NSView *)anchor; diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 2f0bbb9..0ac9547 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -130,7 +130,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { return self; } - (BOOL)isFlipped { return YES; } -- (void)drawRect:(NSRect)rect {if([self.identifier isEqual:@"inspectorBackground"])DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);} +- (void)drawRect:(NSRect)rect {if([self.identifier isEqual:@"inspectorBackground"]){if(DYThemeWorkspaceContext(self)){[[NSColor colorWithWhite:DYThemeIsLight()?.88:.145 alpha:1]setFill];NSRectFill(self.bounds);}else DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}} - (BOOL)isAccessibilityElement { return YES; } - (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; } - (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); } @@ -159,7 +159,10 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { - (NSArray *)accessibilityVisibleChildren { return self.accessibilityChildren; } - (NSArray *)accessibilityChildrenInNavigationOrder { return self.accessibilityChildren; } - (id)accessibilityVerticalScrollBar { return self.hasVerticalScroller?self.verticalScroller:nil; } -- (void)scrollWheel:(NSEvent*)event{if(!self.hasVerticalScroller){[self.nextResponder scrollWheel:event];return;}[super scrollWheel:event];} +- (void)scrollWheel:(NSEvent*)event{ + if(!self.hasVerticalScroller&&self.hasHorizontalScroller&&self.documentView.bounds.size.width>self.contentSize.width){NSPoint p=self.contentView.bounds.origin;CGFloat delta=fabs(event.scrollingDeltaX)>fabs(event.scrollingDeltaY)?event.scrollingDeltaX:event.scrollingDeltaY;p.x=MAX(0,MIN(self.documentView.bounds.size.width-self.contentSize.width,p.x-delta));p.y=0;[self.contentView scrollToPoint:p];[self reflectScrolledClipView:self.contentView];return;} + if(!self.hasVerticalScroller&&!self.hasHorizontalScroller){[self.nextResponder scrollWheel:event];return;}[super scrollWheel:event]; +} @end @interface DYCard : DYFlippedView @@ -439,13 +442,14 @@ static NSImage *DYWheelImage(void) { } @property(nonatomic,assign) id delegate; - (void)setValues:(NSDictionary *)values; +@property(nonatomic) BOOL horizontalLayout; @end @implementation DYWheelPanel - (instancetype)initWithFrame:(NSRect)frame {if((self=[super initWithFrame:frame])){NSMutableArray *w=[NSMutableArray array];for(NSInteger i=0;i<4;i++){DYColorWheel *wheel=[[[DYColorWheel alloc]initWithIndex:i]autorelease];[self addSubview:wheel];[w addObject:wheel];}_wheels=[w copy];}return self;} - (void)dealloc {[_wheels release];[super dealloc];} - (void)setDelegate:(id)delegate {_delegate=delegate;for(DYColorWheel *wheel in _wheels)wheel.delegate=delegate;} - (void)setValues:(NSDictionary *)values {for(NSInteger i=0;i<4;i++)[_wheels[i] setHue:[values[[NSString stringWithFormat:@"grade%ld_0",(long)i]] doubleValue] saturation:[values[[NSString stringWithFormat:@"grade%ld_1",(long)i]] doubleValue]];} -- (void)layout {[super layout];CGFloat w=self.bounds.size.width/2,h=self.bounds.size.height/2;for(NSInteger i=0;i<4;i++)[_wheels[i] setFrame:NSMakeRect((i%2)*w,(i/2)*h,w,h)];} +- (void)layout {[super layout];CGFloat w=self.bounds.size.width/(_horizontalLayout?4:2),h=self.bounds.size.height/(_horizontalLayout?1:2);for(NSInteger i=0;i<4;i++)[_wheels[i] setFrame:NSMakeRect((_horizontalLayout?i:i%2)*w,(_horizontalLayout?0:i/2)*h,w,h)];} @end #include "DYNewPanels.inc.h" @@ -533,7 +537,7 @@ NSView *DYCreateWorkspaceMaskEditor(id b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b]; }_themeButtons=[themes copy]; _scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect]; - _scroll.hasVerticalScroller=!_embedded||_workspaceEditor; _scroll.hasHorizontalScroller=NO; _scroll.drawsBackground=NO; + _scroll.hasVerticalScroller=!_embedded&&!_workspaceEditor; _scroll.hasHorizontalScroller=_workspaceEditor;_scroll.scrollerStyle=NSScrollerStyleOverlay;_scroll.automaticallyAdjustsContentInsets=NO;_scroll.contentInsets=NSEdgeInsetsZero; _scroll.drawsBackground=NO; _scroll.autohidesScrollers=YES; _scroll.borderType=NSNoBorder; _scroll.clipsToBounds=YES;_scroll.wantsLayer=YES;_scroll.layer.masksToBounds=YES; _scroll.contentView.clipsToBounds=YES; @@ -569,7 +573,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [super dealloc]; } - (BOOL)isFlipped { return YES; } -- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);} +- (void)drawRect:(NSRect)rect {if(_workspaceEditor){[[NSColor colorWithWhite:DYThemeIsLight()?.88:.145 alpha:1]setFill];NSRectFill(self.bounds);}else DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);} - (BOOL)isAccessibilityElement { return YES; } - (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; } @@ -682,7 +686,7 @@ NSView *DYCreateWorkspaceMaskEditor(id if([key isEqual:@"grading"]) { DYWheelPanel *wheels=[[[DYWheelPanel alloc]initWithFrame:NSZeroRect]autorelease];wheels.delegate=self;wheels.identifier=@"gradingWheels";[card addSubview:wheels];[body addObject:wheels];[_graphics addObject:wheels]; } - if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];} + if([key isEqual:@"spider"]){_spiderPanel=[[[DYSpiderPanel alloc]initWithFrame:NSZeroRect]autorelease];_spiderPanel.delegate=self;_spiderPanel.horizontalLayout=_workspaceEditor;_spiderPanel.identifier=@"spiderGraph";[card addSubview:_spiderPanel];[body addObject:_spiderPanel];} for(NSDictionary *d in section[@"rows"]) { DYFlippedView *row=[[[DYFlippedView alloc] initWithFrame:NSZeroRect] autorelease]; row.identifier=d[@"key"]; @@ -821,11 +825,20 @@ NSView *DYCreateWorkspaceMaskEditor(id } if([row.identifier isEqual:@"hslTabs"]){CGFloat width=row.bounds.size.width/9;NSInteger i=0;for(NSView *button in row.subviews)[button setFrame:NSMakeRect(i++*width,1,width-1,27)];} } - if(_workspaceEditor){CGFloat available=cw-24,columns=MAX(1,floor(available/280)),columnWidth=available/columns,wy=0;NSInteger column=0; - for(NSView *row in body){if(row.hidden)continue;BOOL full=[row.identifier hasPrefix:@"heading:"]||[row.identifier hasSuffix:@"Graph"]||[row.identifier hasSuffix:@"Tabs"]||[row.identifier hasSuffix:@"Controls"]||[row.identifier isEqual:@"gradingWheels"]||[row.identifier isEqual:@"primaryBalance"]||[row isKindOfClass:NSSegmentedControl.class]; - if(full){if(column){wy+=32;column=0;}CGFloat rh=[self heightForRow:row];if([row.identifier isEqual:@"curveGraph"])rh=MAX(180,MIN(300,available/4+26));row.frame=NSMakeRect(12,wy,available,rh);wy+=rh;} - else {row.frame=NSMakeRect(12+column*columnWidth,wy,columnWidth-8,31);if(++column>=(NSInteger)columns){column=0;wy+=32;}} - }if(column)wy+=32;card.frame=NSMakeRect(16,card.frame.origin.y,cw,wy+8);y=NSMaxY(card.frame)+8; + if(_workspaceEditor){ + CGFloat height=MAX(160,_scroll.contentSize.height-12),x=8,ry=0,columnWidth=250;BOOL occupied=NO; + for(NSView *row in body){if(row.hidden)continue;NSString *identifier=row.identifier?:@""; + BOOL graphic=[identifier hasSuffix:@"Graph"]||[identifier isEqual:@"gradingWheels"]||[identifier isEqual:@"primaryBalance"]; + if(graphic){if(occupied){x+=columnWidth+12;ry=0;occupied=NO;}CGFloat gw=[identifier isEqual:@"spiderGraph"]?MIN(height,270)+190:[identifier isEqual:@"curveGraph"]?MAX(520,_scroll.contentSize.width-16):[identifier isEqual:@"gradingWheels"]?MAX(640,MIN(height,260)*4):MIN(height,260); + row.frame=NSMakeRect(x,0,gw,height);if([row isKindOfClass:DYWheelPanel.class])[(DYWheelPanel*)row setHorizontalLayout:YES];if([identifier isEqual:@"primaryBalance"])for(NSView *view in row.subviews)view.frame=row.bounds;x+=gw+14;continue;} + CGFloat rh=[identifier hasPrefix:@"heading:"]?26:34;if(ry+rh>height){x+=columnWidth+12;ry=0;} + CGFloat rw=[identifier isEqual:@"hslTabs"]?MAX(250,MIN(430,_scroll.contentSize.width-16)):columnWidth; + row.frame=NSMakeRect(x,ry,rw,rh-1);ry+=rh;occupied=YES; + if([identifier hasPrefix:@"heading:"])for(NSView *view in row.subviews)view.frame=NSMakeRect(2,5,rw-4,18); + if([identifier hasSuffix:@"Controls"]){CGFloat bw=(rw-4*(row.subviews.count-1))/MAX((NSUInteger)1,row.subviews.count);NSInteger index=0;for(NSView *view in row.subviews)view.frame=NSMakeRect((bw+4)*index++,3,bw,25);} + if([identifier isEqual:@"hslTabs"]){NSInteger index=0;for(NSView *view in row.subviews)view.frame=NSMakeRect(index++*rw/9,1,rw/9-1,27);if(rw>columnWidth){x+=rw+12;ry=0;occupied=NO;}} + } + card.frame=NSMakeRect(0,6,MAX(_scroll.contentSize.width,x+(occupied?columnWidth:0)+8),height);y=_scroll.contentSize.height; } y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w]; } @@ -843,7 +856,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [r[@"choose"]setFrame:NSMakeRect(97,3,MAX(65,rw-152),26)];[r[@"folder"]setFrame:NSMakeRect(rw-51,4,24,24)];[r[@"remove"]setFrame:NSMakeRect(rw-23,4,22,24)]; } y=[self layoutRepeatedToolsAfter:@"tail" y:y width:w]; - _stackHeight=y;[_document setFrameSize:NSMakeSize(_scroll.contentSize.width,MAX(y,_scroll.contentSize.height))]; + _stackHeight=y;CGFloat documentWidth=_scroll.contentSize.width;if(_workspaceEditor)for(NSDictionary *card in _cards)documentWidth=MAX(documentWidth,[card[@"view"]frame].size.width);[_document setFrameSize:NSMakeSize(documentWidth,_workspaceEditor?_scroll.contentSize.height:MAX(y,_scroll.contentSize.height))]; } - (id)actionAPI { return [_manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; } - (void)refresh { diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index b350bd0..8eddf4a 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -167,7 +167,7 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){ NSProgress *_libraryTask,*_selectionTask; NSTimer *_progressTimer; NSUInteger _libraryGeneration,_selectionGeneration; - NSInteger _columns; + NSInteger _columns,_horizontalRows; CGFloat _tileWidth,_tileHeight,_sidebarWidth; } @end @@ -272,7 +272,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b NSAccessibilityPostNotification(parent,NSAccessibilityLayoutChangedNotification); } - (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction{ - _embedded=YES;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回调整"; + _embedded=YES;_folderScroll.hasVerticalScroller=NO;_gridScroll.hasVerticalScroller=NO;_gridScroll.hasHorizontalScroller=YES;_gridScroll.scrollerStyle=NSScrollerStyleOverlay;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回调整"; } - (void)fitRemoteParent{ NSView *parent=_root.superview;if(_closed||!_remoteMode||!parent)return; @@ -383,7 +383,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b BOOL list=_layoutMenu.indexOfSelectedItem==1;NSInteger columns=list?1:MAX(1,(NSInteger)floor((available+gap)/(tileWidth+gap)));tileWidth=list?MAX(110,available-14):MIN(tileWidth,(available-gap*(columns-1)-14)/columns);tileWidth=MAX(70,tileWidth); _columns=columns;_tileWidth=tileWidth;_tileHeight=list?70:ceil(tileWidth*9/16)+24; NSInteger rows=(_visibleEntries.count+columns-1)/columns;CGFloat contentHeight=MAX(_gridScroll.contentSize.height,rows*(_tileHeight+gap)+12); - _gridDocument.frame=NSMakeRect(0,0,available,contentHeight);_emptyLabel.frame=NSMakeRect(20,MAX(36,_gridScroll.contentSize.height/2-45),MAX(50,available-40),90); + if(_embedded){_horizontalRows=MAX(1,NSInteger((_gridScroll.contentSize.height-12)/(_tileHeight+gap)));NSInteger horizontalColumns=(_visibleEntries.count+_horizontalRows-1)/_horizontalRows;_gridDocument.frame=NSMakeRect(0,0,MAX(available,horizontalColumns*(_tileWidth+gap)+14),_gridScroll.contentSize.height);}else{_horizontalRows=0;_gridDocument.frame=NSMakeRect(0,0,available,contentHeight);}_emptyLabel.frame=NSMakeRect(20,MAX(36,_gridScroll.contentSize.height/2-45),MAX(50,available-40),90); _layingOut=NO;[self updateVisibleTiles]; } - (CGFloat)splitView:(NSSplitView *)split constrainMinCoordinate:(CGFloat)proposed ofSubviewAt:(NSInteger)index{return 128;} @@ -400,11 +400,12 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b NSRect visible=NSInsetRect(_gridScroll.contentView.bounds,-30,-180);CGFloat step=_tileHeight+10; NSUInteger first=(NSUInteger)MAX(0,floor((NSMinY(visible)-8)/step))*_columns; NSUInteger end=MIN(_visibleEntries.count,(NSUInteger)MAX(0,ceil((NSMaxY(visible)-8)/step)+1)*_columns); + if(_horizontalRows){CGFloat horizontalStep=_tileWidth+10;first=(NSUInteger)MAX(0,floor((NSMinX(visible)-7)/horizontalStep))*_horizontalRows;end=MIN(_visibleEntries.count,(NSUInteger)MAX(0,ceil((NSMaxX(visible)-7)/horizontalStep)+1)*_horizontalRows);} NSMutableSet *wanted=[NSMutableSet set];BOOL changed=NO; for(NSUInteger i=first;i @property(nonatomic,readonly) CGFloat contentHeight; +@property(nonatomic,readonly) CGFloat contentWidth; @property(nonatomic) BOOL workspaceMode; @property(nonatomic,readonly) NSString *selectedMaskID; - (instancetype)initWithManager:(id)manager nodeID:(NSString*)nodeID; @@ -15,12 +16,10 @@ @synthesize workspaceMode=_workspaceMode; - (NSString*)selectedMaskID{return _maskID;} - (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];} -- (CGFloat)workspaceHeightForWidth:(CGFloat)width{ - if(!_contentHeight)return 0;CGFloat w=MAX(560,width),header=w>=860?48:88;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++; - CGFloat side=shape?MIN(240,MAX(190,w*.27)):0,left=w-16-(shape?side+20:0);NSInteger columns=shape?2:MIN(3,MAX(1,NSInteger(left/172)));CGFloat scalar=ceil(double(count)/columns)*50; - CGFloat actions=(pen?80:0)+(shape?174:0)+60;return header+(shape?MAX(scalar,actions):scalar+68)+8; +- (CGFloat)contentHeight{return _workspaceMode?self.bounds.size.height:_contentHeight;} +- (CGFloat)contentWidth{ + if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL actions=(_tracking.count&&![_tracking[0]isHidden])||!_penRedraw.hidden;BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actionWidth=actions?216:0;if(pen&&shape&&self.bounds.size.height<242)actionWidth+=216;return MAX(620,16+ceil(double(count)/perColumn)*214+actionWidth+216); } -- (CGFloat)contentHeight{return _workspaceMode&&self.bounds.size.width>=560?[self workspaceHeightForWidth:self.bounds.size.width]:_contentHeight;} - (void)selectMaskID:(NSString*)maskID{ if([_maskID isEqual:maskID]){if(!_canvasActive)[self canvas:nil];return;}BOOL found=NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID]){found=YES;break;}if(!found)return; [_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil]; @@ -72,17 +71,16 @@ } - (void)layout{ [super layout];CGFloat w=self.bounds.size.width; - if(_workspaceMode&&w>=560){ - CGFloat x=8,y=8;BOOL wide=w>=860,shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden; - CGFloat first=wide?MAX(180,w-470):w-128;_eye.frame=NSMakeRect(x,y,28,30);x+=36;_list.frame=NSMakeRect(x,y,first,30);x+=first+6;_add.frame=NSMakeRect(x,y,30,30);x+=34;_remove.frame=NSMakeRect(x,y,30,30);x+=40; - if(!wide){x=8;y=48;}_combine.frame=NSMakeRect(x,y,106,30);x+=116;_invert.frame=NSMakeRect(x,y+2,76,26);x+=86;_canvas.frame=NSMakeRect(x,y,MAX(100,w-x-8),30); - CGFloat top=wide?48:88,side=shape?MIN(240,MAX(190,w*.27)):0,left=w-16-(shape?side+20:0);NSInteger columns=shape?2:MIN(3,MAX(1,NSInteger(left/172)));CGFloat cell=(left-(columns-1)*16)/columns;NSUInteger index=0; - for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat rx=8+(index%columns)*(cell+16),ry=top+(index/columns)*50;label.frame=NSMakeRect(rx,ry+3,MAX(62,cell-80),21);[row[@"field"]setFrame:NSMakeRect(rx+cell-76,ry,76,25)];[row[@"slider"]setFrame:NSMakeRect(rx,ry+25,cell,21)];index++;} - CGFloat ax=shape?w-side-8:8,aw=shape?side:left,ay=top; - if(pen){CGFloat bw=(aw-8)/2;_penRedraw.frame=NSMakeRect(ax,ay,bw,30);_penFinish.frame=NSMakeRect(ax+bw+8,ay,bw,30);_penCancel.frame=NSMakeRect(ax,ay+36,aw,30);ay+=80;} - if(shape){_trackingTitle.frame=NSMakeRect(ax,ay+2,aw,20);ay+=28;CGFloat bw=(aw-8)/2;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(ax+(i%2)*(bw+8),ay+(i/2)*34,bw,30)];ay+=106;_clear.frame=NSMakeRect(ax,ay,aw,30);ay+=40;} - else ay=top+ceil(double(index)/columns)*50+8; - _status.frame=NSMakeRect(ax,ay+2,aw,54);return; + if(_workspaceMode){ + CGFloat h=self.bounds.size.height;_eye.frame=NSMakeRect(8,4,26,28);_list.frame=NSMakeRect(38,4,132,28);_add.frame=NSMakeRect(174,4,26,28);_remove.frame=NSMakeRect(204,4,26,28);_combine.frame=NSMakeRect(242,4,92,28);_invert.frame=NSMakeRect(344,6,68,24);_canvas.frame=NSMakeRect(422,4,100,28); + NSInteger perColumn=MAX(1,NSInteger((h-48)/44));NSUInteger index=0; + for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*214,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,126,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+132,y,66,24)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,198,18)];index++;} + CGFloat x=16+ceil(double(index)/perColumn)*214,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden; + if(pen){_penRedraw.frame=NSMakeRect(x,y,aw,25);y+=29;_penFinish.frame=NSMakeRect(x,y,97,25);_penCancel.frame=NSMakeRect(x+103,y,97,25);y+=33;} + if(shape){if(y+135>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;} + // Pen and tracking actions get adjacent columns when the short strip cannot + // hold both; no vertical clipping and no hidden controls below the viewport. + if(y+32>h){x+=216;y=42;}_status.font=[NSFont systemFontOfSize:10];_status.frame=NSMakeRect(x,y,aw,MIN(54,MAX(26,h-y-4)));return; } _eye.frame=NSMakeRect(0,4,32,34);_list.frame=NSMakeRect(38,4,MAX(60,w-114),34);_add.frame=NSMakeRect(w-70,4,32,34);_remove.frame=NSMakeRect(w-32,4,32,34); CGFloat combineWidth=MIN(112,MAX(90,w*.45));_combine.frame=NSMakeRect(0,46,combineWidth,34);_invert.frame=NSMakeRect(combineWidth+12,49,MAX(70,w-combineWidth-12),28);_canvas.frame=NSMakeRect(0,88,w,36); diff --git a/大鱼调色/Plugin/DYNewPanels.inc.h b/大鱼调色/Plugin/DYNewPanels.inc.h index 0c1f798..28cb07b 100644 --- a/大鱼调色/Plugin/DYNewPanels.inc.h +++ b/大鱼调色/Plugin/DYNewPanels.inc.h @@ -2,6 +2,7 @@ // the recorded sibling source repositories; the adapter writes this host model. #include "DYSpiderDisc.inc.h" @interface DYSpiderPanel : DYFlippedView +@property(nonatomic) BOOL horizontalLayout; @property(nonatomic,assign) id delegate; - (void)setMesh:(NSData *)mesh linked:(BOOL)linked; @end @@ -30,7 +31,9 @@ } - (void)dealloc{_disc.changed=nil;_disc.gesture=nil;_disc.selectionChanged=nil;[_disc release];[_hues release];[_saturation release];[_link release];[_status release];[super dealloc];} - (void)setMesh:(NSData *)data linked:(BOOL)linked{auto m=DYSpiderMesh(data);_disc.meshData=[NSData dataWithBytes:&m length:sizeof(m)];_linked=linked;[_hues selectItemWithTag:m.hues];[_saturation selectItemWithTag:m.rings+1];_link.state=linked?NSControlStateValueOn:NSControlStateValueOff;} -- (void)layout{[super layout];CGFloat w=self.bounds.size.width;_disc.frame=NSMakeRect(0,0,w,300); +- (void)layout{[super layout];CGFloat w=self.bounds.size.width; + if(_horizontalLayout){CGFloat d=MIN(self.bounds.size.height,w-186),x=d+12,cw=w-x-6;_disc.frame=NSMakeRect(0,0,d,d);[[self viewWithTag:101]setFrame:NSMakeRect(x,7,48,18)];_hues.frame=NSMakeRect(x+58,2,cw-58,26);[[self viewWithTag:102]setFrame:NSMakeRect(x,37,48,18)];_saturation.frame=NSMakeRect(x+58,32,cw-58,26);_link.frame=NSMakeRect(x,64,cw,22);CGFloat bw=(cw-6)/2;for(int i=0;i<5;i++)[[self viewWithTag:201+i]setFrame:NSMakeRect(x+(i%2)*(bw+6),94+(i/2)*30,bw,26)];_status.frame=NSMakeRect(x,188,cw,MAX(24,self.bounds.size.height-190));return;} + _disc.frame=NSMakeRect(0,0,w,300); [[self viewWithTag:101]setFrame:NSMakeRect(0,307,32,20)];_hues.frame=NSMakeRect(33,301,60,27); [[self viewWithTag:102]setFrame:NSMakeRect(99,307,43,20)];_saturation.frame=NSMakeRect(142,301,60,27);_link.frame=NSMakeRect(MAX(205,w-61),304,61,23); _status.frame=NSMakeRect(2,334,w-4,36);CGFloat gap=5,bw=(w-gap)/2; diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index f9dacd6..d21180e 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -20,17 +20,20 @@ @implementation DYPlugIn { DYRenderer *_renderer; BOOL _copyAnalyzed; - std::atomic_bool _betaFirstRenderStarted; + std::atomic_bool _betaFirstRenderStarted,_modelRefreshPending; #include "DYToolHostIvars.inc.h" } #include "DYToolHostMethods.inc.h" -- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}DYBetaSpanEnd(beta,nil);return self;} +- (instancetype)initWithAPIManager:(id)manager{uint64_t beta=DYBetaSpanBegin(@"plugin_init",nil);if((self=[super init])){_betaFirstRenderStarted.store(false);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(exportRequested:) name:@"DYExportLUT" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoGrade" object:manager];[n addObserver:self selector:@selector(autoRequested:) name:@"DYAutoWhiteBalance" object:manager];[n addObserver:self selector:@selector(whiteBalanceRequested:) name:@"DYWhiteBalanceColor" object:manager];}DYBetaSpanEnd(beta,nil);return self;} - (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_renderer release];[super dealloc];} - (BOOL)properties:(NSDictionary**)p error:(NSError**)e{*p=@{kFxPropertyKey_MayRemapTime:@NO,kFxPropertyKey_PixelTransformSupport:@(kFxPixelTransform_ScaleTranslate),kFxPropertyKey_VariesWhenParamsAreStatic:@YES,kFxPropertyKey_DesiredProcessingColorInfo:@(kFxImageColorInfo_RGB_LINEAR),kFxPropertyKey_NeedsFullBuffer:@YES};return YES;} - (BOOL)addParametersWithError:(NSError**)e{return DYCreateParameters(_apiManager,e);} - (NSSet*)classesForCustomParameterID:(UInt32)pid{return pid==DYToolsParameterID?[NSSet setWithObjects:DYToolDocument.class,NSDictionary.class,NSArray.class,NSString.class,NSNumber.class,NSData.class,nil]:pid==DYAssetsParameterID?[NSSet setWithObjects:DYAssetState.class,NSDictionary.class,NSString.class,NSData.class,nil]:[NSSet setWithObjects:DYInspectorToken.class,NSDictionary.class,NSString.class,NSNumber.class,nil];} - (NSView*)createViewForParameterID:(UInt32)pid{[self scheduleToolCanvasRegistration];return pid==DYInspectorParameterID?[[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]:[[NSView alloc]initWithFrame:NSZeroRect];} -- (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self.apiManager];});return YES;} +- (BOOL)parameterChanged:(UInt32)pid atTime:(CMTime)t error:(NSError**)e{if(pid==DYToolsParameterID)[self adoptToolCanvasDocument:DYReadTools(_apiManager,t).document];if(pid==DYToolsParameterID||pid==2013||pid==2014||(pid>=2236&&pid<2400)||pid==DYAssetsParameterID)[_renderer invalidatePreview];// Many parameter callbacks arrive in one host transaction. Refresh the native + // inspector once after the transaction unwinds, rather than queueing a full + // remote parameter read and view rebuild for every scalar in the burst. + if(!_modelRefreshPending.exchange(true))dispatch_async(dispatch_get_main_queue(),^{self->_modelRefreshPending.store(false);[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self.apiManager];});return YES;} - (BOOL)pluginState:(NSData**)state atTime:(CMTime)t quality:(FxQuality)q error:(NSError**)e{ DYUniforms u;DYReadUniforms(_apiManager,t,&u);CMTime frameDuration=kCMTimeInvalid,origin=kCMTimeZero;idtiming=[_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];if([timing respondsToSelector:@selector(frameDuration:)])[timing frameDuration:&frameDuration];if([timing respondsToSelector:@selector(startTimeForEffect:)])[timing startTimeForEffect:&origin];int64_t frame=DYFilmFrameIndex(t,frameDuration,origin);u.filmFrameKey=DYFilmFrameKey(frame,u.film.grainHold,u.film.grainSeed);DYAssetState*a=DYReadAssets(_apiManager,t);DYToolDocument *tools=DYReadTools(_apiManager,t);[self adoptToolCanvasDocument:tools.document];[_viewerParameterBridge publishUniforms:&u document:tools.document atTime:t];[_viewerParameterBridge publishAssets:a histogram:nil atTime:t];double copyAuto=0;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getFloatValue:©Auto fromParameter:8800 atTime:t];NSMutableDictionary *snapshot=DYMutablePlist(DYToolRenderSnapshot(tools.document,t));for(NSMutableDictionary *node in snapshot[@"layers"]){DYUniforms layer=DYToolUniforms(node);if([node[@"type"]isEqual:@"film"])node[@"filmFrameKey"]=@(DYFilmFrameKey(frame,layer.film.grainHold,layer.film.grainSeed));}NSInteger primaries=-1;idgamut=[_apiManager apiForProtocol:@protocol(FxColorGamutAPI_v2)];if([gamut respondsToSelector:@selector(colorPrimaries)])primaries=gamut.colorPrimaries;NSDictionary*s=@{@"colorManagement":a.colorManagement?:@{},@"hostPrimaries":@(primaries),@"schema":@2,@"tools":snapshot,@"copyAuto":@(copyAuto>.5),@"uniforms":[NSData dataWithBytes:&u length:sizeof(u)],@"paths":a.paths?:@{},@"spider":a.spiderMesh?:[NSData data]};*state=[NSPropertyListSerialization dataWithPropertyList:s format:NSPropertyListBinaryFormat_v1_0 options:0 error:e];return *state!=nil; } diff --git a/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h b/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h index 48f7605..acf174d 100644 --- a/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYSharedMaskDiagnostics.inc.h @@ -32,9 +32,9 @@ BOOL compactFits=YES,compactRows=YES; for(int kind=0;kind<6;kind++){ NSMutableDictionary *state=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document);NSDictionary *mask=DYAddSharedMask(state,kind);NSView *editor=DYCreateWorkspaceMaskEditor(manager,@"shared");[editor refreshWithDocument:state time:kCMTimeZero];[editor selectMaskID:mask[@"id"]]; - for(NSNumber *width in @[@377,@600,@860,@1200]){[editor setFrameSize:NSMakeSize(width.doubleValue,500)];[editor setFrameSize:NSMakeSize(width.doubleValue,editor.contentHeight)];[editor layoutSubtreeIfNeeded];for(NSView *view in editor.subviews)if(!view.hidden)compactFits&=NSContainsRect(editor.bounds,view.frame)&&view.frame.size.width>0&&view.frame.size.height>0;for(NSDictionary *row in [editor valueForKey:@"_rows"]){NSView *label=row[@"label"],*field=row[@"field"],*slider=row[@"slider"];if(label.hidden)continue;compactRows&=!NSIntersectsRect(label.frame,field.frame)&&!NSIntersectsRect(label.frame,slider.frame)&&!NSIntersectsRect(field.frame,slider.frame)&&field.frame.size.width>=70&&slider.frame.size.width>=140;}} + for(NSNumber *width in @[@377,@600,@860,@1200]){[editor setFrameSize:NSMakeSize(width.doubleValue,235)];[editor setFrameSize:NSMakeSize(MAX(width.doubleValue,editor.contentWidth),editor.contentHeight)];[editor layoutSubtreeIfNeeded];for(NSView *view in editor.subviews)if(!view.hidden)compactFits&=NSContainsRect(editor.bounds,view.frame)&&view.frame.size.width>0&&view.frame.size.height>0;for(NSDictionary *row in [editor valueForKey:@"_rows"]){NSView *label=row[@"label"],*field=row[@"field"],*slider=row[@"slider"];if(label.hidden)continue;compactRows&=!NSIntersectsRect(label.frame,field.frame)&&!NSIntersectsRect(label.frame,slider.frame)&&!NSIntersectsRect(field.frame,slider.frame)&&field.frame.size.width>=64&&slider.frame.size.width>=140;}} } - run.record(@"workspace-six-mask-editors-fit-377-600-860-1200-point-widths",compactFits&&compactRows); + run.record(@"workspace-six-mask-editors-flow-horizontally-at-235-point-height",compactFits&&compactRows); } // Exercise the actual IOSurface/Metal path against independently owned masks. diff --git a/大鱼调色/Plugin/DYTheme.h b/大鱼调色/Plugin/DYTheme.h index 867131d..1a9cdd3 100644 --- a/大鱼调色/Plugin/DYTheme.h +++ b/大鱼调色/Plugin/DYTheme.h @@ -8,6 +8,7 @@ FOUNDATION_EXPORT NSDictionary *DYThemePalette(void); FOUNDATION_EXPORT NSColor *DYThemeColor(NSString *role); FOUNDATION_EXPORT BOOL DYThemeIsLight(void); FOUNDATION_EXPORT BOOL DYThemeUsesRelief(void); +FOUNDATION_EXPORT BOOL DYThemeWorkspaceContext(NSView *view); // 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); diff --git a/大鱼调色/Plugin/DYTheme.mm b/大鱼调色/Plugin/DYTheme.mm index 8fac6de..6931b57 100644 --- a/大鱼调色/Plugin/DYTheme.mm +++ b/大鱼调色/Plugin/DYTheme.mm @@ -108,6 +108,8 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized, NSBezierPath *inner=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect,1.5,1.5) xRadius:MAX(0,radius-1.5) yRadius:MAX(0,radius-1.5)]; [[rgb(.40,.60,.73)colorWithAlphaComponent:strong?.35:.12]setStroke];inner.lineWidth=.5;[inner stroke]; } +BOOL DYThemeWorkspaceContext(NSView *view){for(NSView *ancestor=view;ancestor;ancestor=ancestor.superview)if([ancestor.identifier isEqual:@"DYColorWorkspace"])return YES;return NO;} +static void drawWorkspaceControl(NSRect frame,BOOL pressed){NSBezierPath *shape=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:3 yRadius:3];[[NSColor colorWithWhite:DYThemeIsLight()?(pressed?.72:.81):(pressed?.19:.25) alpha:1]setFill];[shape fill];[[NSColor colorWithWhite:DYThemeIsLight()?.57:.34 alpha:1]setStroke];shape.lineWidth=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast?1.5:.5;[shape stroke];} @implementation DYThemeLabel - (void)drawRect:(NSRect)rect {[super drawRect:rect];} @end @@ -121,6 +123,7 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized, } - (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view { if(!self.bordered){[super drawBezelWithFrame:frame inView:view];return;} + if(DYThemeWorkspaceContext(view)){drawWorkspaceControl(frame,self.highlighted);return;} BOOL selected=[view.identifier isEqual:@"appearanceToggle"]&&self.state==NSControlStateValueOn; DYDrawSoftControl(NSInsetRect(frame,2,3),7,selected,[view.identifier isEqual:@"primaryAction"],self.highlighted); } @@ -128,13 +131,13 @@ void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized, @implementation DYThemeButton + (Class)cellClass {return DYThemeButtonCell.class;} - (void)drawRect:(NSRect)rect { - if([self.identifier isEqual:@"layerAction"])DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted); + if([self.identifier isEqual:@"layerAction"]&&!DYThemeWorkspaceContext(self))DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted); [super drawRect:rect]; } @end @implementation DYThemePopUpButton - (void)drawRect:(NSRect)rect { - NSRect bounds=NSInsetRect(self.bounds,2,3);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawSoftControl(bounds,6,NO,NO,self.cell.highlighted); + NSRect bounds=NSInsetRect(self.bounds,2,3);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];if(DYThemeWorkspaceContext(self))drawWorkspaceControl(self.bounds,self.cell.highlighted);else 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/DYToolHostMethods.inc.h b/大鱼调色/Plugin/DYToolHostMethods.inc.h index d502579..7706aa7 100644 --- a/大鱼调色/Plugin/DYToolHostMethods.inc.h +++ b/大鱼调色/Plugin/DYToolHostMethods.inc.h @@ -26,7 +26,7 @@ - (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}} - (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;} - (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time { - @synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;NSDictionary *m=_toolCanvasDraft?:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage)};} + @synchronized(self){if(_toolDrawingShape&&_toolCanvasDraft&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_toolCanvasEditTime)!=0)){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,已取消本次框选。"];}if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(time)&&CMTIME_IS_NUMERIC(_toolCanvasEditTime)&&CMTimeCompare(time,_toolCanvasEditTime)==0;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage)};} } - (void)toolTrackRequested:(NSNotification*)notification { NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;} diff --git a/大鱼调色/Plugin/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index 9ccf973..32400f9 100644 --- a/大鱼调色/Plugin/DYToolInspector.inc.h +++ b/大鱼调色/Plugin/DYToolInspector.inc.h @@ -55,6 +55,6 @@ // Synchronous notification here can re-enter the host's ViewBridge callback. } -- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;} +- (CGFloat)layoutRepeatedToolsAfter:(NSString*)anchor y:(CGFloat)y width:(CGFloat)w {if(_embedded||_workspaceEditor)return y;for(NSString *ID in _stackOrder)if([_stackRoots[ID]isEqual:anchor]){DYInspector *child=_stackViews[ID];child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child layoutSubtreeIfNeeded];CGFloat height=MAX(60,child->_stackHeight);child.frame=NSMakeRect(0,y,w,height);y+=height;}return y;} - (void)resetRepeatedTool{if(!_embedded)return;idhost=[(DYToolManager*)_manager host];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSMutableDictionary *node=(id)DYToolWithID(doc,[(DYToolManager*)_manager nodeID]);if(!node)return;NSDictionary *fresh=DYNewTool(node[@"type"]);node[@"values"]=DYMutablePlist(fresh[@"values"]);if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms root;DYReadUniforms(host,a.currentTime,&root);DYSeedPrimaryWorkingSpace(node,root.cm.workingTransfer,root.cm.workingGamut);}node[@"paths"]=@{};[node removeObjectForKey:@"spider"];node[@"spiderLinked"]=@YES;idundo=[host apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:@"还原独立工具层"];DYWriteTools(host,doc,a.currentTime);[undo endUndoGroup];}@finally{[a endAction:self];}[self postChanged];} diff --git a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h index 58cef0d..eac39b3 100644 --- a/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolPenDiagnostics.inc.h @@ -27,5 +27,12 @@ // Finish and the next drag can arrive before the main queue gets a turn. redraw();click(170,275);click(445,275);click(300,140);int queuedUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];[osc mouseDownAtPositionX:320 positionY:212.5 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseDraggedAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:348 positionY:196.75 activePart:1 modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain();NSDictionary *queuedDoc=DYReadTools(base,kCMTimeZero).document;DYMaskParameters moved=DYMaskAtTime([queuedDoc[@"baseMasks"][@"hsl"]lastObject],kCMTimeZero);run.record(@"pen-finish-and-next-gesture-serialize-without-dropping-either",base->_undoStarts==queuedUndo+2&&fabs(moved.centerX-.55)<1e-5&&fabs(moved.centerY-.55)<1e-5); redraw();click(170,275);click(445,275);click(300,140);[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:CMTimeMake(1,25)];drain();run.record(@"pen-refuses-to-finish-stale-draft-after-playhead-moves",[DYReadTools(base,kCMTimeZero).document isEqual:queuedDoc]&&base->_undoStarts==queuedUndo+2&&![[plugin toolCanvasMaskAtTime:CMTimeMake(1,25)][@"drawing"]boolValue]); + // Shared pen closure must expose the completed path during the very next OSC + // callback, before the queued author write is allowed to run. + NSMutableDictionary *sharedDoc=DYMutablePlist(DYReadTools(base,kCMTimeZero).document);NSDictionary *shared=DYAddSharedMask(sharedDoc,DYMaskBezier);NSString *sharedID=shared[@"id"];DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:hsl",YES);DYSetSharedMaskAssigned(sharedDoc,sharedID,@"base:spider",YES);DYWriteTools(base,sharedDoc,kCMTimeZero); + [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":sharedID,@"document":DYReadTools(base,kCMTimeZero).document,@"draw":@YES}]; + click(170,275);click(445,275);click(300,140);int sharedUndo=base->_undoStarts;[osc keyDownAtPositionX:300 positionY:140 keyPressed:13 modifiers:0 forceUpdate:&update didHandle:&handled atTime:kCMTimeZero];NSDictionary *closed=[plugin toolCanvasMaskAtTime:kCMTimeZero];DYMaskParameters closedParameters;[closed[@"parameters"]getBytes:&closedParameters length:sizeof(closedParameters)]; + run.record(@"shared-pen-close-keeps-three-point-bezier-before-author-write",closedParameters.kind==DYMaskBezier&&[closed[@"nodes"]length]==3*sizeof(DYBezierNode)&&![closed[@"drawing"]boolValue]&&base->_undoStarts==sharedUndo); + drain();NSDictionary *sharedAuthor=DYReadTools(base,kCMTimeZero).document,*savedShared=DYSharedMaskWithID(sharedAuthor,sharedID);run.record(@"shared-pen-close-persists-same-path-and-both-module-references-once",[savedShared[@"nodes"]isEqual:closed[@"nodes"]]&&DYToolIDsForSharedMask(sharedAuthor,sharedID).count==2&&base->_undoStarts==sharedUndo+1&&[[plugin toolCanvasMaskAtTime:kCMTimeZero][@"nodes"]isEqual:closed[@"nodes"]]); [osc release];[plugin release]; } diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h index 11697e2..6094bb8 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h @@ -41,11 +41,11 @@ // Cache only the top content strip. A background-painted sibling must never // erase the heading/page selector/close button in that strip. static NSBitmapImageRep *DYWorkspaceHeaderBitmap(NSView *root){ - NSRect top=NSMakeRect(0,0,root.bounds.size.width,52);NSBitmapImageRep *bitmap=[root bitmapImageRepForCachingDisplayInRect:top];if(bitmap)[root cacheDisplayInRect:top toBitmapImageRep:bitmap];return bitmap; + NSRect top=NSMakeRect(0,0,root.bounds.size.width,36);NSBitmapImageRep *bitmap=[root bitmapImageRepForCachingDisplayInRect:top];if(bitmap)[root cacheDisplayInRect:top toBitmapImageRep:bitmap];return bitmap; } static NSUInteger DYWorkspaceHeaderInk(NSBitmapImageRep *bitmap,NSView *root,NSView *control){ if(!bitmap||!bitmap.pixelsWide||!bitmap.pixelsHigh)return 0;NSColor *base=[[bitmap colorAtX:0 y:0]colorUsingColorSpace:NSColorSpace.deviceRGBColorSpace];if(!base)return 0; - CGFloat scale=bitmap.pixelsWide/root.bounds.size.width;NSInteger left=MAX(0,NSInteger(floor(NSMinX(control.frame)*scale))),right=MIN(bitmap.pixelsWide,NSInteger(ceil(NSMaxX(control.frame)*scale)));NSUInteger count=0; + CGFloat scale=bitmap.pixelsWide/root.bounds.size.width;NSInteger left=MAX(0,NSInteger(floor(NSMinX([control convertRect:control.bounds toView:root])*scale))),right=MIN(bitmap.pixelsWide,NSInteger(ceil(NSMaxX([control convertRect:control.bounds toView:root])*scale)));NSUInteger count=0; for(NSInteger y=0;y.12))count++;} return count; } @@ -55,7 +55,7 @@ static BOOL DYWorkspaceLargeDirtyPreservesHeader(NSBitmapImageRep *bitmap,NSView // Map the pane's flipped local coordinates into the cached top-strip pixels. // Intentionally bypass AppKit's clipping here: the draw implementation must // itself stay within its bounds even for a deliberately oversized dirty rect. - CGContextTranslateCTM(cg,0,bitmap.pixelsHigh);CGContextScaleCTM(cg,bitmap.pixelsWide/root.bounds.size.width,-bitmap.pixelsHigh/52.0);NSPoint origin=[pane convertRect:pane.bounds toView:root].origin;CGContextTranslateCTM(cg,origin.x,origin.y); + CGContextTranslateCTM(cg,0,bitmap.pixelsHigh);CGContextScaleCTM(cg,bitmap.pixelsWide/root.bounds.size.width,-bitmap.pixelsHigh/36.0);NSPoint origin=[pane convertRect:pane.bounds toView:root].origin;CGContextTranslateCTM(cg,origin.x,origin.y); [pane drawRect:NSInsetRect(pane.bounds,-200,-200)];[NSGraphicsContext restoreGraphicsState]; NSData *after=[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh];return [before isEqual:after]; } diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index afa67e9..dabeebf 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -8,18 +8,18 @@ DYColorWorkspace *workspace=[[[DYColorWorkspace alloc]initWithManager:host renderer:scopeRenderer library:scopeLibrary title:@"原片段"]autorelease]; [workspace showRelativeToView:nil];workspaceDrain();NSView *root=[workspace valueForKey:@"root"]; run.record(@"workspace-remote-attaches-within-host-permissions",workspace.visible&&host->_requests==1&&!host->_permissionFailure&&root.superview==host->_parent&&!fixture.visible); - NSView *scopePane=[workspace valueForKey:@"scopePane"],*heading=[workspace valueForKey:@"heading"],*pages=[workspace valueForKey:@"pages"],*closeButton=nil;for(NSView *control in root.subviews)if([control isKindOfClass:NSButton.class]&&[[(NSButton*)control title]isEqual:@"关闭"])closeButton=control; - run.record(@"workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture",[(NSSegmentedControl*)pages segmentCount]==4&&[(NSSegmentedControl*)pages selectedSegment]==0&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&host->_minimumRequested.height<=300); - run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==720&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360); - [workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scopes-page-enables-only-visible-output-capture",[(NSSegmentedControl*)pages selectedSegment]==3&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]); - NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading),pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); + NSView *scopePane=[workspace valueForKey:@"scopePane"],*toolbar=[workspace valueForKey:@"toolbar"],*closeButton=[workspace valueForKey:@"_close"];NSArray *plots=[workspace valueForKey:@"scopePlots"];BOOL tabs=NO;for(NSView *view in root.subviews)tabs|=[view isKindOfClass:NSSegmentedControl.class]; + run.record(@"workspace-layer-driven-editing-has-no-root-tabs-and-four-persistent-scopes",!tabs&&plots.count==4&&!scopePane.hidden&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&[(NSSplitView*)[workspace valueForKey:@"split"]subviews].count==3); + run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==840&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360); + [workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scope-shortcut-preserves-adjustment-editor-and-capture",[[workspace valueForKey:@"editorMode"]integerValue]==0&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]); + NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); NSString *headerPNG=[runtime stringByAppendingPathComponent:@"workspace-topbar.png"];BOOL headerSaved=[[headerBitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:headerPNG atomically:YES]; - run.record(@"workspace-offscreen-topbar-heading-pages-close-render-pixels",headerSaved&&headingInk>20&&pagesInk>50&&closeInk>20,@{@"headingPixels":@(headingInk),@"pagesPixels":@(pagesInk),@"closePixels":@(closeInk),@"path":headerPNG}); + run.record(@"workspace-offscreen-compact-icons-and-close-render-pixels",headerSaved&&toolbarInk>80&&closeInk>10,@{@"toolbarPixels":@(toolbarInk),@"closePixels":@(closeInk),@"path":headerPNG}); run.record(@"workspace-content-and-scope-pane-explicitly-clip",root.clipsToBounds&&scopePane.clipsToBounds); run.record(@"workspace-oversized-scope-dirty-cannot-erase-topbar",DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane)); - [host->_parent setFrameSize:NSMakeSize(800,540)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds)); - headerBitmap=DYWorkspaceHeaderBitmap(root);headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading);pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); - run.record(@"workspace-topbar-survives-resize-and-large-dirty-redraw",headingInk>20&&pagesInk>50&&closeInk>20&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"headingPixels":@(headingInk),@"pagesPixels":@(pagesInk),@"closePixels":@(closeInk)}); + [host->_parent setFrameSize:NSMakeSize(840,300)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds)); + headerBitmap=DYWorkspaceHeaderBitmap(root);toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); + run.record(@"workspace-topbar-survives-minimum-resize-and-large-dirty-redraw",toolbarInk>80&&closeInk>10&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"toolbarPixels":@(toolbarInk),@"closePixels":@(closeInk)}); [workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent); [workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0); @@ -60,7 +60,7 @@ [scopeRenderer setScopeEnabled:YES];[scopeRenderer captureScopeTile:finalTile atTime:CMTimeMake(7,24)];double scopeDeadline=NSProcessInfo.processInfo.systemUptime+5;while(!scopeRenderer.scopeMetadata&&NSProcessInfo.processInfo.systemUptime_parent=fixture.contentView; DYColorWorkspace *stack=[[[DYColorWorkspace alloc]initWithManager:stackHost renderer:stackRenderer library:stackLibrary title:@"图层同步"]autorelease]; DYInspector *mainInspector=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer]autorelease];[stack showRelativeToView:nil];workspaceDrain(); - NSView *toolbar=[stack valueForKey:@"toolbar"];NSSegmentedControl *pages=[stack valueForKey:@"pages"];NSTableView *table=[stack valueForKey:@"layerTable"]; + NSView *toolbar=[stack valueForKey:@"toolbar"];NSTableView *table=[stack valueForKey:@"layerTable"]; auto toolbarButton=[&](NSString *type)->NSButton *{for(NSButton *button in toolbar.subviews)if([button.identifier isEqual:type])return button;return nil;}; auto chooseNode=[&](NSString *node)->BOOL{NSArray *rows=[stack valueForKey:@"layerRows"];for(NSUInteger i=0;iprevious&&button.frame.origin.y==0;previous=button.frame.origin.x;} @@ -87,22 +87,28 @@ [curveEditor graphicGesture:YES title:@"测试外部改值"];[stackHost startAction:stack];NSMutableDictionary *externalCurve=DYMutablePlist(DYReadTools(stackHost,kCMTimeZero).document);((NSMutableDictionary*)DYToolWithID(externalCurve,curveID))[@"values"][@"curveY0"]=@22;DYWriteTools(stackHost,externalCurve,kCMTimeZero);[stackHost endAction:stack];[curveEditor writeGraphicValues:@{@"curveY0":@44}];[curveEditor graphicGesture:NO title:nil]; run.record(@"workspace-curve-gesture-preserves-an-external-parameter-edit",[DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]==22); NSView *workspaceRoot=[stack valueForKey:@"root"];[workspaceRoot layoutSubtreeIfNeeded];NSBitmapImageRep *workspaceImage=[workspaceRoot bitmapImageRepForCachingDisplayInRect:workspaceRoot.bounds];[workspaceRoot cacheDisplayInRect:workspaceRoot.bounds toBitmapImageRep:workspaceImage];[[workspaceImage representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:@"workspace-adjustments.png"]atomically:YES]; - [stackHost->_parent setFrameSize:NSMakeSize(720,300)];[workspaceRoot layoutSubtreeIfNeeded];[table layoutSubtreeIfNeeded];BOOL eyesInside=YES;NSUInteger eyes=0;NSMutableArray *buttonFrames=[NSMutableArray array]; - for(NSInteger row=0;row_parent setFrameSize:NSMakeSize(840,300)];[workspaceRoot layoutSubtreeIfNeeded];[table layoutSubtreeIfNeeded];BOOL eyesInside=YES;NSUInteger eyes=0;NSMutableArray *buttonFrames=[NSMutableArray array]; + for(NSInteger row=0;row_parent setFrameSize:NSMakeSize(1120,360)];[workspaceRoot layoutSubtreeIfNeeded]; [stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookA=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookB=[[[stack valueForKey:@"selectedNode"]copy]autorelease]; run.need(@"workspace-two-independent-lut-layer-fixtures-exist",lookA&&lookB&&![lookA isEqual:lookB]&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookA)&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookB)); NSString *pathA=[runtime stringByAppendingPathComponent:@"workspace-A.cube"],*pathB=[runtime stringByAppendingPathComponent:@"workspace-B.cube"],*late=[runtime stringByAppendingPathComponent:@"workspace-late.cube"];NSDictionary *basePaths=[[DYReadAssets(stackHost,kCMTimeZero).paths copy]autorelease];NSError *failure=nil; BOOL selectedA=chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];BOOL wroteA=[stack commitLUT:pathA expected:[stack selectionContext]error:&failure]; - BOOL selectedB=chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];BOOL wroteB=[stack commitLUT:pathB expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document; - run.record(@"workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing",selectedA&&selectedB&&wroteA&&wroteB&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&[basePaths isEqual:DYReadAssets(stackHost,kCMTimeZero).paths]&&[[[stack valueForKey:@"lutTarget"]nodeID]isEqual:lookB]); - run.record(@"workspace-switching-lut-target-stays-on-visible-browser-page",pages.selectedSegment==2&&[[stack valueForKey:@"browser"]visible]); - chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);pages.selectedSegment=2;[stack pageChanged:pages];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document; + BOOL selectedB=chooseNode(lookB);run.record(@"workspace-stylized-lut-row-opens-browser-with-scopes-still-visible",[[stack valueForKey:@"editorMode"]integerValue]==2&&[[stack valueForKey:@"browser"]visible]&&![(NSView*)[stack valueForKey:@"scopePane"]isHidden]);BOOL wroteB=[stack commitLUT:pathB expected:[stack selectionContext]error:&failure];tools=DYReadTools(stackHost,kCMTimeZero).document; + run.record(@"workspace-lut-layer-selection-rebinds-from-layer-a-to-b-without-cross-writing",selectedA&&selectedB&&wroteA&&wroteB&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]&&[basePaths isEqual:DYReadAssets(stackHost,kCMTimeZero).paths]&&[[[stack valueForKey:@"lutTarget"]nodeID]isEqual:lookB]); + run.record(@"workspace-switching-lut-target-directly-shows-browser",[[stack valueForKey:@"editorMode"]integerValue]==2&&[[stack valueForKey:@"browser"]visible]); + chooseNode(lookA);[stack showPage:@"lut" maskKind:nil];__block BOOL completed=NO;__block NSError *cancelled=nil;NSProgress *pending=[stack selectLUT:late completion:^(NSError *error){completed=YES;cancelled=error;}];chooseNode(lookB);[stack showPage:@"lut" maskKind:nil];[stackRenderer completePreparation];tools=DYReadTools(stackHost,kCMTimeZero).document; run.record(@"workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",pending.cancelled&&completed&&cancelled&&[DYToolWithID(tools,lookA)[@"paths"][@"look0"]isEqual:pathA]&&[DYToolWithID(tools,lookB)[@"paths"][@"look0"]isEqual:pathB]); BOOL choseHSL=chooseNode(@"base:hsl");undo=stackHost->_undoStarts;[stack createWorkspaceMask:1];workspaceDrain();NSString *sharedID=[[[stack valueForKey:@"selectedMask"]copy]autorelease]; NSButton *assign=[NSButton checkboxWithTitle:@"蜘蛛调色" target:nil action:nil];assign.identifier=@"base:spider";assign.state=NSControlStateValueOn;[stack maskAssignmentChanged:assign];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSArray *hslMasks=DYMasksForTool(tools,@"base:hsl"),*spiderMasks=DYMasksForTool(tools,@"base:spider"); BOOL mainHasShared=NO;for(NSDictionary *card in [mainInspector valueForKey:@"cards"])if([card[@"section"][@"key"]isEqual:@"hsl"]){NSDictionary *document=[card[@"maskPanel"]valueForKey:@"document"];mainHasShared=[DYMasksForTool(document,@"base:hsl").firstObject[@"id"]isEqual:sharedID];} run.record(@"workspace-shared-mask-links-hsl-and-spider-as-one-author-object",choseHSL&&sharedID&&DYSharedMasks(tools).count==1&&hslMasks.count==1&&spiderMasks.count==1&&hslMasks.firstObject==spiderMasks.firstObject&&[hslMasks.firstObject[@"id"]isEqual:sharedID]&&DYToolIDsForSharedMask(tools,sharedID).count==2&&mainHasShared&&stackHost->_undoStarts==undo+2&&stackHost->_undoEnds==stackHost->_undoStarts); + // The layer mask symbol is the navigation entry, preserving the shared object. + chooseNode(@"base:hsl");NSArray *entryRows=[stack valueForKey:@"layerRows"];NSInteger entryRow=-1;for(NSUInteger i=0;i=0&&[[stack valueForKey:@"selectedMask"]isEqual:sharedID]&&[[stack valueForKey:@"editorMode"]integerValue]==1&&![(NSView*)[stack valueForKey:@"scopePane"]isHidden]); + NSScrollView *maskStrip=[stack valueForKey:@"maskScroll"],*assignStrip=[stack valueForKey:@"assignmentScroll"];NSView *maskContent=maskStrip.documentView;[maskContent layoutSubtreeIfNeeded];BOOL maskFits=YES;for(NSView *view in maskContent.subviews)if(!view.hidden)maskFits&=NSContainsRect(maskContent.bounds,view.frame); + run.record(@"workspace-mask-editor-and-assignments-fit-height-without-vertical-scrollers",!maskStrip.hasVerticalScroller&&!assignStrip.hasVerticalScroller&&fabs(maskContent.frame.size.height-maskStrip.contentSize.height)<1&&maskFits,@{@"mask":NSStringFromRect(maskContent.bounds),@"viewport":NSStringFromSize(maskStrip.contentSize)}); [stack deleteWorkspaceSelection:nil];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSView *maskEditor=[stack valueForKey:@"maskEditor"]; run.record(@"workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",!DYSharedMaskWithID(tools,sharedID)&&!DYMasksForTool(tools,@"base:hsl").count&&!DYMasksForTool(tools,@"base:spider").count&&![[stack valueForKey:@"selectedMask"]length]&&(!maskEditor||!maskEditor.superview||maskEditor.hidden)); chooseNode(@"base:hsl");[stack createWorkspaceMask:0];workspaceDrain();NSString *oldMask=[[[stack valueForKey:@"selectedMask"]copy]autorelease];[stack close]; @@ -111,5 +117,11 @@ run.record(@"workspace-closed-panel-never-steals-canvas-or-module-selection",oldMask&&canvasSelections==1&&toolSelections==0&&!stack.visible); [NSNotificationCenter.defaultCenter removeObserver:canvasObserver];[NSNotificationCenter.defaultCenter removeObserver:toolObserver]; run.record(@"workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",stackHost->_writesInAction&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0&&stackHost->_undoStarts==stackHost->_undoEnds&&!fixture.visible); + for(NSString *type in DYToolTypes()){ + DYInspector *editor=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer workspaceType:type]autorelease];editor.frame=NSMakeRect(0,0,424,235);[editor refresh];[editor layoutSubtreeIfNeeded];NSScrollView *strip=[editor valueForKey:@"scroll"];NSView *document=[editor valueForKey:@"document"];BOOL fits=!strip.hasVerticalScroller&&strip.hasHorizontalScroller&&fabs(document.bounds.size.height-strip.contentSize.height)<1;NSMutableArray *bad=[NSMutableArray array]; + for(NSDictionary *record in [editor valueForKey:@"cards"]){NSView *card=record[@"view"];for(NSView *row in record[@"body"])if(!row.hidden&&!card.hidden){BOOL inside=NSContainsRect(card.bounds,row.frame);fits&=inside;if(!inside)[bad addObject:@{@"id":row.identifier?:@"",@"frame":NSStringFromRect(row.frame),@"card":NSStringFromRect(card.bounds)}];}} + run.record([@"workspace-horizontal-minimum-height-" stringByAppendingString:type],fits,@{@"document":NSStringFromRect(document.bounds),@"viewport":NSStringFromSize(strip.contentSize),@"outside":bad}); + if([type isEqual:@"spider"]){NSView *panel=[editor valueForKey:@"spiderPanel"];[panel layoutSubtreeIfNeeded];NSView *disc=[panel valueForKey:@"disc"],*hues=[panel valueForKey:@"hues"];run.record(@"workspace-spider-places-disc-left-and-parameters-right",NSMaxX(disc.frame)<=NSMinX(hues.frame)&&NSContainsRect(panel.bounds,hues.frame));} + } [stack showRelativeToView:nil];workspaceDrain();NSString *selectedBefore=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack toggleWorkspaceSize:nil];workspaceDrain();BOOL expanded=stack.visible&&stackHost->_maximumRequested.height==1200&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore];[stack toggleWorkspaceSize:nil];workspaceDrain();run.record(@"workspace-size-mode-keeps-selection-and-recreates-only-host-window",expanded&&stack.visible&&stackHost->_maximumRequested.height==360&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore]&&!stackHost->_permissionFailure);[stack close]; } diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index 545b027..e9ff4fc 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -2,21 +2,21 @@ - (id)rootHost {return [_manager isKindOfClass:DYToolManager.class]?[(DYToolManager*)_manager host]:_manager;} - (id)lutManager {return _lutTarget?:_manager;} - (void)buildToolWorkspace { - _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v2"];if(_splitFraction<.12||_splitFraction>.45)_splitFraction=.21;_toolTime=kCMTimeInvalid;_sizingSplit=YES; + _splitFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.layerFraction.v3"];if(_splitFraction<.12||_splitFraction>.4)_splitFraction=.18;_scopeFraction=[NSUserDefaults.standardUserDefaults doubleForKey:@"com.dayu.color.workspace.scopeFraction.v1"];if(_scopeFraction<.15||_scopeFraction>.45)_scopeFraction=.27;_toolTime=kCMTimeInvalid;_sizingSplit=YES; _toolbarScroll=[[NSScrollView alloc]init];_toolbarScroll.hasHorizontalScroller=YES;_toolbarScroll.autohidesScrollers=YES;_toolbarScroll.drawsBackground=NO; _toolbar=[[DYWorkspaceList alloc]initWithFrame:NSMakeRect(0,0,1200,34)];_toolbarScroll.documentView=_toolbar;[_root addSubview:_toolbarScroll]; - CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];NSDictionary *icons=@{@"primary":@"slider.horizontal.3",@"spider":@"circle.hexagongrid",@"base":@"sun.max",@"skin":@"person.crop.circle",@"look":@"square.stack.3d.up",@"hsl":@"paintpalette",@"curve":@"point.topleft.down.to.point.bottomright.curvepath",@"grading":@"circle.lefthalf.filled",@"primaries":@"circle.grid.2x2",@"levels":@"chart.bar",@"blackwhite":@"circle.righthalf.filled",@"balance":@"dial.low",@"mixer":@"slider.vertical.3",@"film":@"film",@"lens":@"camera.aperture"};button.image=[NSImage imageWithSystemSymbolName:icons[type] accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=34;button.frame=NSMakeRect(x,0,width,28);[_toolbar addSubview:button];x+=width+4;}_toolbar.frame=NSMakeRect(0,0,x,30); + CGFloat x=0;for(NSString *type in DYToolTypes()) {NSString *title=DYToolSection(type)[@"title"]?:type;NSButton *button=DYWorkspaceButton(title,self,@selector(addWorkspaceTool:));button.identifier=type;button.toolTip=[@"添加独立模块:" stringByAppendingString:title];button.image=[NSImage imageWithSystemSymbolName:DYWorkspaceSymbol(type) accessibilityDescription:title];button.imagePosition=NSImageOnly;button.contentTintColor=DYThemeColor(@"text");CGFloat width=28;button.frame=NSMakeRect(x,0,width,27);[_toolbar addSubview:button];x+=width+2;}_toolbar.frame=NSMakeRect(0,0,x,30); _split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split]; _toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost]; - _layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll]; - _layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable; + _layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=NO;_layerScroll.autohidesScrollers=YES;_layerScroll.scrollerStyle=NSScrollerStyleOverlay;_layerScroll.automaticallyAdjustsContentInsets=NO;_layerScroll.contentInsets=NSEdgeInsetsZero;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll]; + _layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=28;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYWorkspacePalette()[@"background"];_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable; _addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask]; _deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer]; _selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle]; _maskPane=[[DYWorkspaceList alloc]init];_maskPane.clipsToBounds=YES;[_editorHost addSubview:_maskPane];_maskPane.hidden=YES; - _maskScroll=[[NSScrollView alloc]init];_maskScroll.hasVerticalScroller=YES;_maskScroll.autohidesScrollers=YES;_maskScroll.drawsBackground=NO;[_maskPane addSubview:_maskScroll]; - _assignmentScroll=[[NSScrollView alloc]init];_assignmentScroll.hasVerticalScroller=YES;_assignmentScroll.autohidesScrollers=YES;_assignmentScroll.drawsBackground=NO;_assignmentScroll.accessibilityLabel=@"共享蒙版生效模块";[_maskPane addSubview:_assignmentScroll]; - [_scopePane removeFromSuperview];[_editorHost addSubview:_scopePane];[_lutPane removeFromSuperview];[_editorHost addSubview:_lutPane];[_lutExplanation removeFromSuperview];[_editorHost addSubview:_lutExplanation]; + _maskScroll=[[NSScrollView alloc]init];_maskScroll.hasVerticalScroller=NO;_maskScroll.hasHorizontalScroller=YES;_maskScroll.scrollerStyle=NSScrollerStyleOverlay;_maskScroll.autohidesScrollers=YES;_maskScroll.drawsBackground=NO;[_maskPane addSubview:_maskScroll]; + _assignmentScroll=[[NSScrollView alloc]init];_assignmentScroll.hasVerticalScroller=NO;_assignmentScroll.hasHorizontalScroller=YES;_assignmentScroll.scrollerStyle=NSScrollerStyleOverlay;_assignmentScroll.autohidesScrollers=YES;_assignmentScroll.drawsBackground=NO;_assignmentScroll.accessibilityLabel=@"共享蒙版生效模块";[_maskPane addSubview:_assignmentScroll]; + [_scopePane removeFromSuperview];[_split addSubview:_scopePane];[_lutPane removeFromSuperview];[_editorHost addSubview:_lutPane];[_lutExplanation removeFromSuperview];[_editorHost addSubview:_lutExplanation]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(refreshToolWorkspace:) name:DYModelChanged object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceCanvasSelection:) name:@"DYToolCanvasSelection" object:[self rootHost]]; [NSNotificationCenter.defaultCenter addObserver:self selector:@selector(externalWorkspaceToolSelection:) name:@"DYWorkspaceToolSelection" object:[self rootHost]]; @@ -24,17 +24,18 @@ } - (void)layoutToolWorkspace { if(!_split||_sizingSplit)return;_sizingSplit=YES; - CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,left=MAX(174,MIN(w-320,w*_splitFraction)); - _toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+_split.dividerThickness,0,MAX(1,w-left-_split.dividerThickness),h); - _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*30));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); + CGFloat w=_split.bounds.size.width,h=_split.bounds.size.height,scope=MAX(240,MIN(420,w*_scopeFraction)),left=MAX(174,MIN(MIN(300,w-scope-322),w*_splitFraction)),divider=_split.dividerThickness,editor=MAX(1,w-left-scope-2*divider); + _toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+divider,0,editor,h);_scopePane.frame=NSMakeRect(left+divider+editor+divider,0,scope,h); + _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*_layerTable.rowHeight));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29)); _maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(230,MAX(160,ew*.25));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height); - if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,_maskScroll.contentSize.width,MAX(_maskScroll.contentSize.height,_maskEditor.contentHeight));} + if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(620,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];} + [self layoutMaskAssignments]; _sizingSplit=NO; } -- (CGFloat)splitView:(NSSplitView*)split constrainSplitPosition:(CGFloat)position ofSubviewAt:(NSInteger)index {return MAX(174,MIN(split.bounds.size.width-320,position));} +- (CGFloat)splitView:(NSSplitView*)split constrainSplitPosition:(CGFloat)position ofSubviewAt:(NSInteger)index {return index==0?MAX(174,MIN(NSMinX(_scopePane.frame)-320,position)):MAX(NSMaxX(_toolPane.frame)+320,MIN(split.bounds.size.width-240,position));} - (void)splitView:(NSSplitView*)split resizeSubviewsWithOldSize:(NSSize)old{[self layoutToolWorkspace];} -- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;if(NSApp.currentEvent.type!=NSEventTypeLeftMouseDragged&&NSApp.currentEvent.type!=NSEventTypeLeftMouseUp)return;_splitFraction=MAX(.12,MIN(.45,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction.v2"];[self layoutWorkspace];} +- (void)splitViewDidResizeSubviews:(NSNotification*)notification {if(_sizingSplit)return;if(NSApp.currentEvent.type!=NSEventTypeLeftMouseDragged&&NSApp.currentEvent.type!=NSEventTypeLeftMouseUp)return;_splitFraction=MAX(.12,MIN(.4,_toolPane.frame.size.width/MAX(1,_split.bounds.size.width)));_scopeFraction=MAX(.15,MIN(.45,_scopePane.frame.size.width/MAX(1,_split.bounds.size.width)));[NSUserDefaults.standardUserDefaults setDouble:_splitFraction forKey:@"com.dayu.color.workspace.layerFraction.v3"];[NSUserDefaults.standardUserDefaults setDouble:_scopeFraction forKey:@"com.dayu.color.workspace.scopeFraction.v1"];[self layoutWorkspace];} - (BOOL)workspaceBaseVisible:(NSString*)type document:(NSDictionary*)document time:(CMTime)time { if(DYBaseToolRemoved(document,type))return NO; if([@[@"primary",@"spider",@"base",@"hsl"]containsObject:type])return YES; @@ -57,7 +58,7 @@ for(NSString*type in bases){NSString*base=[@"base:" stringByAppendingString:type];[ordered addObject:base];for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:base])[ordered addObject:ID];} for(NSString*ID in display)if(DYToolWithID(document,ID)&&[DYToolRootAnchor(document,ID)isEqual:@"tail"])[ordered addObject:ID]; for(NSString*ID in [ordered reverseObjectEnumerator]){NSDictionary*node=DYToolWithID(document,ID);NSString*type=node?node[@"type"]:[ID substringFromIndex:5];if(!node&&![self workspaceBaseVisible:type document:document time:_toolTime])continue; - NSString*title=titles[ID]?:DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool"}]; + NSString*title=titles[ID]?:DYToolSection(type)[@"title"]?:type;[rows addObject:@{@"node":ID,@"type":type,@"title":title,@"enabled":@(DYWorkspaceEnabled(node?DYToolUniforms(node):rootUniforms,type)),@"kind":@"tool",@"maskCount":@(DYMasksForTool(document,ID).count)}]; for(NSDictionary*mask in DYMasksForTool(document,ID)){[assignedMasks addObject:mask[@"id"]];DYMaskParameters p=DYMaskAtTime(mask,_toolTime);NSString*name=@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind];[rows addObject:@{@"node":ID,@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@" ◩ " stringByAppendingString:name],@"kind":@"mask"}];} } for(NSDictionary*mask in DYSharedMasks(document))if(![assignedMasks containsObject:mask[@"id"]]){DYMaskParameters p=DYMaskAtTime(mask,_toolTime);[rows addObject:@{@"node":@"shared",@"mask":mask[@"id"],@"enabled":mask[@"enabled"],@"title":[@"◩ 未分配 · " stringByAppendingString:@[@"椭圆",@"矩形",@"钢笔",@"渐变",@"HSL",@"亮度"][p.kind]],@"kind":@"mask"}];} @@ -71,15 +72,23 @@ _refreshingStack=NO;[self rebuildWorkspaceEditor]; } - (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;} +- (NSTableRowView*)tableView:(NSTableView*)table rowViewForRow:(NSInteger)row{return [[[DYWorkspaceRow alloc]init]autorelease];} - (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row { - NSDictionary*item=_layerRows[row];DYWorkspaceCell*cell=[[[DYWorkspaceCell alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.lineBreakMode=NSLineBreakByTruncatingTail;[cell addSubview:label];cell.textField=label; - NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.bezelStyle=NSBezelStyleRegularSquare;eye.focusRingType=NSFocusRingTypeNone;eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];cell.bypass=eye;[cell resizeSubviewsWithOldSize:cell.bounds.size];return cell; + NSDictionary *item=_layerRows[row];DYWorkspaceCell *cell=[[[DYWorkspaceCell alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField *label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:11];label.textColor=[NSColor colorWithWhite:.87 alpha:1];label.lineBreakMode=NSLineBreakByTruncatingTail;[cell addSubview:label];cell.textField=label; + NSImageView *glyph=[[[NSImageView alloc]init]autorelease];glyph.image=[NSImage imageWithSystemSymbolName:item[@"mask"]?@"circle.lefthalf.filled":DYWorkspaceSymbol(item[@"type"]) accessibilityDescription:item[@"title"]];glyph.contentTintColor=[NSColor colorWithWhite:.65 alpha:1];[cell addSubview:glyph];cell.glyph=glyph; + if(!item[@"mask"]){NSButton *mask=DYWorkspaceButton(@"",self,@selector(editWorkspaceRowMask:));mask.bezelStyle=NSBezelStyleRegularSquare;mask.imagePosition=NSImageOnly;mask.image=[NSImage imageWithSystemSymbolName:[item[@"maskCount"]integerValue]?@"circle.lefthalf.filled":@"circle.dashed" accessibilityDescription:@"蒙版"];mask.tag=row;mask.toolTip=[item[@"maskCount"]integerValue]?@"编辑此图层蒙版":@"添加蒙版";mask.accessibilityLabel=[item[@"title"]stringByAppendingString:@"蒙版"];mask.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:mask];cell.maskButton=mask;} + NSButton *eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.bezelStyle=NSBezelStyleRegularSquare;eye.focusRingType=NSFocusRingTypeNone;eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.imagePosition=NSImageOnly;eye.tag=row;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];eye.contentTintColor=[NSColor colorWithWhite:.78 alpha:1];[cell addSubview:eye];cell.bypass=eye;[cell resizeSubviewsWithOldSize:cell.bounds.size];return cell; +} +- (void)editWorkspaceRowMask:(NSButton*)sender{ + if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary *row=_layerRows[sender.tag];_hasUserSelection=YES;[_selectedNode release];_selectedNode=[row[@"node"]copy];[_selectedMask release];_selectedMask=nil; + NSArray *masks=DYMasksForTool(_toolDocument,_selectedNode);if(masks.count){_selectedMask=[masks[0][@"id"]copy];_editorMode=1;[self refreshToolWorkspace:nil];}else [self addWorkspaceMask:sender]; } - (void)tableViewSelectionDidChange:(NSNotification*)note { - if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; + if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_editorMode=_selectedMask?1:[item[@"type"]isEqual:@"look"]?2:0;[self rebuildWorkspaceEditor];[self pageChanged:nil]; } - (void)rebuildWorkspaceEditor { NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);NSString*type=node?node[@"type"]:[_selectedNode hasPrefix:@"base:"]?[_selectedNode substringFromIndex:5]:nil; + _editorMode=_selectedMask?1:[type isEqual:@"look"]?2:0; _selectionTitle.stringValue=_selectedMask?@"蒙版 · 编辑与跟踪":DYToolSection(type)[@"title"]?:@"从上方添加模块";if(!_selectedMask)for(NSDictionary*row in _layerRows)if([row[@"node"]isEqual:_selectedNode]&&!row[@"mask"]){_selectionTitle.stringValue=row[@"title"];break;} if(![_editorNode isEqual:_selectedNode]){[_toolEditor removeFromSuperview];[_toolEditor release];_toolEditor=nil;[_editorNode release];_editorNode=[_selectedNode copy];if(type){idtarget=node?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost];_toolEditor=[[DYInspector alloc]initWithAPIManager:target renderer:_renderer workspaceType:type];[_editorHost addSubview:_toolEditor positioned:NSWindowBelow relativeTo:_maskPane];}} [_toolEditor refresh]; @@ -91,8 +100,8 @@ - (void)showPage:(NSString*)page maskKind:(NSNumber*)kind { NSArray*pages=@[@"tools",@"masks",@"lut",@"scopes"];NSUInteger index=[pages indexOfObject:page];if(index==NSNotFound)index=0; if(kind){[self createWorkspaceMask:kind.integerValue];return;} - if(index==2){NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);if(![node[@"type"]isEqual:@"look"]&&![_selectedNode isEqual:@"base:look"]){for(NSDictionary*row in _layerRows)if([row[@"type"]isEqual:@"look"]){[_selectedNode release];_selectedNode=[row[@"node"]copy];break;}}[self bindLUTTarget];} - _pages.selectedSegment=index;[self pageChanged:nil]; + if(index==2){NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);if(![node[@"type"]isEqual:@"look"]&&![_selectedNode isEqual:@"base:look"]){NSString *target=@"base:look";for(NSDictionary*row in _layerRows)if([row[@"type"]isEqual:@"look"]){target=row[@"node"];break;}[_selectedNode release];_selectedNode=[target copy];[_selectedMask release];_selectedMask=nil;}[self bindLUTTarget];} + if(index<3)_editorMode=index;[self pageChanged:nil]; } - (void)bindLUTTarget { NSDictionary*node=DYToolWithID(_toolDocument,_selectedNode);idtarget=[node[@"type"]isEqual:@"look"]?[[[DYToolManager alloc]initWithHost:[self rootHost]node:node]autorelease]:[self rootHost]; @@ -102,21 +111,24 @@ - (void)addWorkspaceTool:(NSButton*)sender { NSString*type=sender.identifier;if(![DYToolTypes()containsObject:type])return;idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*added=nil; [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSString*anchor=(DYToolWithID(doc,_selectedNode)||[_selectedNode hasPrefix:@"base:"])?_selectedNode:[@"base:" stringByAppendingString:type];NSMutableDictionary*node=(id)DYInsertTool(doc,type,anchor);if(!node){[self reportError:@"模块达到上限,未添加"];return;}if(DYPrimaryColorState(DYReadAssets(host,a.currentTime).colorManagement)){DYUniforms u;DYReadUniforms(host,a.currentTime,&u);DYSeedPrimaryWorkingSpace(node,u.cm.workingTransfer,u.cm.workingGamut);}idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"添加调色模块"];if(DYWriteTools(host,doc,a.currentTime))added=[node[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} - if(added){_pages.selectedSegment=0;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":added}];[added release];} + if(added){_editorMode=0;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host userInfo:@{@"scrollToTool":added}];[added release];} } - (void)addWorkspaceMask:(NSView*)sender {NSMenu*menu=[[[NSMenu alloc]initWithTitle:@"添加共享蒙版"]autorelease];for(NSInteger kind=0;kind<6;kind++){NSMenuItem*item=[menu addItemWithTitle:@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][kind]action:@selector(addWorkspaceMaskKind:)keyEquivalent:@""];item.target=self;item.tag=kind;}[menu popUpMenuPositioningItem:nil atLocation:NSMakePoint(0,sender.bounds.size.height)inView:sender];} - (void)addWorkspaceMaskKind:(NSMenuItem*)sender {[self createWorkspaceMask:sender.tag];} - (void)createWorkspaceMask:(NSInteger)kind { idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;NSString*ID=nil; [a startAction:self];@try{NSMutableDictionary*doc=DYMutablePlist(DYReadTools(host,a.currentTime).document);NSDictionary*mask=DYAddSharedMask(doc,kind);if(!mask)return;NSString*node=_selectedNode;if(_hasUserSelection&&node.length&&![node isEqual:@"shared"])DYSetSharedMaskAssigned(doc,mask[@"id"],node,YES);idundo=[host apiForProtocol:@protocol(FxUndoAPI)];BOOL grouped=[undo startUndoGroup:@"创建共享蒙版"];if(DYWriteTools(host,doc,a.currentTime))ID=[mask[@"id"]copy];if(grouped)[undo endUndoGroup];}@finally{[a endAction:self];} - if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_hasUserSelection||!_selectedNode){[_selectedNode release];_selectedNode=[@"shared" copy];}_pages.selectedSegment=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; + if(!ID)return;[_selectedMask release];_selectedMask=ID;if(!_hasUserSelection||!_selectedNode){[_selectedNode release];_selectedNode=[@"shared" copy];}_editorMode=1;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host]; [NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":ID,@"document":_toolDocument?:@{},@"draw":@(kind==2),@"drawShape":@(kind==0||kind==1)}]; } - (void)rebuildMaskAssignments { - DYWorkspaceList*list=[[[DYWorkspaceList alloc]init]autorelease];CGFloat y=8;NSTextField*heading=[DYThemeLabel labelWithString:_selectedMask?@"应用到模块":@"选择或绘制一个蒙版"];heading.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];heading.frame=NSMakeRect(8,y,210,24);[list addSubview:heading];y+=30; + DYWorkspaceList*list=[[[DYWorkspaceList alloc]init]autorelease];NSTextField*heading=[DYThemeLabel labelWithString:_selectedMask?@"应用到模块":@"选择或绘制蒙版"];heading.font=[NSFont systemFontOfSize:11 weight:NSFontWeightSemibold];[list addSubview:heading]; NSArray*assigned=DYToolIDsForSharedMask(_toolDocument,_selectedMask); - for(NSDictionary*row in _layerRows)if([row[@"kind"]isEqual:@"tool"]){NSButton*check=[NSButton checkboxWithTitle:row[@"title"]target:self action:@selector(maskAssignmentChanged:)];check.identifier=row[@"node"];check.state=[assigned containsObject:row[@"node"]]?NSControlStateValueOn:NSControlStateValueOff;check.enabled=_selectedMask.length>0;check.frame=NSMakeRect(8,y,210,28);check.accessibilityLabel=[@"蒙版应用到 " stringByAppendingString:row[@"title"]];[list addSubview:check];y+=30;} - list.frame=NSMakeRect(0,0,220,y+8);_assignmentScroll.documentView=list; + for(NSDictionary*row in _layerRows)if([row[@"kind"]isEqual:@"tool"]){NSButton*check=[NSButton checkboxWithTitle:row[@"title"]target:self action:@selector(maskAssignmentChanged:)];check.identifier=row[@"node"];check.font=[NSFont systemFontOfSize:11];check.state=[assigned containsObject:row[@"node"]]?NSControlStateValueOn:NSControlStateValueOff;check.enabled=_selectedMask.length>0;check.accessibilityLabel=[@"蒙版应用到 " stringByAppendingString:row[@"title"]];[list addSubview:check];} + _assignmentScroll.documentView=list;[self layoutMaskAssignments]; +} +- (void)layoutMaskAssignments { + NSView *list=_assignmentScroll.documentView;if(!list)return;CGFloat h=MAX(1,_assignmentScroll.contentSize.height),cw=MAX(152,_assignmentScroll.contentSize.width);NSInteger perColumn=MAX(1,NSInteger((h-34)/27)),index=0;for(NSView *view in list.subviews){if([view isKindOfClass:NSButton.class]){view.frame=NSMakeRect(8+(index/perColumn)*cw,32+(index%perColumn)*27,cw-16,25);index++;}else view.frame=NSMakeRect(8,6,cw-16,22);}list.frame=NSMakeRect(0,0,MAX(cw,ceil(double(index)/perColumn)*cw),h); } - (void)maskAssignmentChanged:(NSButton*)sender { if(!_selectedMask)return;idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL written=NO; @@ -124,10 +136,10 @@ if(written)[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:host];else [self reportError:@"宿主未保存蒙版关联,原设置已保留"]; } - (void)workspaceCanvasSelection:(NSNotification*)note { - if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_pages.selectedSegment=1;[self rebuildWorkspaceEditor]; + if(!_visible||_refreshingStack||![note.userInfo[@"mask"]length])return;NSString*mask=note.userInfo[@"mask"];if([mask isEqual:_selectedMask])return;[_selectedMask release];_selectedMask=[mask copy];if(![note.userInfo[@"node"]isEqual:@"shared"]){[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];}_editorMode=1;[self rebuildWorkspaceEditor]; } - (void)externalWorkspaceToolSelection:(NSNotification*)note { - if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_pages.selectedSegment=0;[self refreshToolWorkspace:nil];} + if(![note.userInfo[@"source"]isEqual:@"inspector"]||![note.userInfo[@"node"]length])return;_hasUserSelection=YES;[_selectedNode release];_selectedNode=[note.userInfo[@"node"]copy];[_selectedMask release];_selectedMask=nil;if(_visible){_editorMode=0;[self refreshToolWorkspace:nil];} } - (void)toggleWorkspaceRow:(NSButton*)sender { if(sender.tag<0||sender.tag>=_layerRows.count)return;NSDictionary*row=_layerRows[sender.tag];NSString*ID=row[@"node"];idhost=[self rootHost];ida=[host apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;