From 69040fd73097bcd38ed916426c89f89682491b05 Mon Sep 17 00:00:00 2001 From: mac Date: Fri, 6 Nov 2026 14:18:59 +0800 Subject: [PATCH] fix: measure all expanded inspector modules before host view creation --- research/UnifiedPipeline1.17.0.md | 4 + 大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h | 36 ++++---- 大鱼调色/Plugin/DYInspector.h | 1 - 大鱼调色/Plugin/DYInspector.mm | 92 ++++++++++---------- 大鱼调色/Plugin/DYPlugIn.mm | 35 +------- 大鱼调色/Plugin/DYToolInspector.inc.h | 2 +- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 8 files changed, 73 insertions(+), 101 deletions(-) diff --git a/research/UnifiedPipeline1.17.0.md b/research/UnifiedPipeline1.17.0.md index 2d68b89..3aea3ce 100644 --- a/research/UnifiedPipeline1.17.0.md +++ b/research/UnifiedPipeline1.17.0.md @@ -30,3 +30,7 @@ 候选 101 在唯一正式位置签名/公证/票据通过后测试,950 项原生检查通过。FCP 中人脸马赛克、共享矩形蒙版切换、输出默认末层、上移及一次撤销通过;自动鼠标未进入 OSC 的旧限制仍存在,同逻辑的检查器菜单已实测。相关证据见 `verification/HostUnified1.17.0-candidate101.json`。已回滚正式 97,候选 APP 删除;没有 1.17.0 包或 Release。 用户收到界面方式待选问题:独立自适应浮窗,或继续检查器内重构。尚未收到答复,不自行替换产品交互。下一步先替换失败的 `inspectorHeightChanged:` 方案,按所选方式完成真实宿主展开/收起/新增模块/颜色设置/冷重开,再进入正式打包发布。 + +## 102:按用户决定全部展开后一次测高 + +用户明确选择“把全部模块展开,然后计算所需高度”。保留 FCP 检查器,去掉 101 的参数删除/标志隐藏重建;整合版显示全部未删除的模块,独立模板仍保留其单一根模块。初始界面展开全部模块和颜色设置,读取完整文档后同步测高;展开只影响呈现,不改启用状态、参数或旧存档折叠字段。原生测量预留现有分页的最大内容及颜色设置模式高度,避免页签/V4 切换裁切;根界面没有内部 ScrollView。真实 FCP 全量显示、末层滚动和新增层行为仍须正式候选 102 实测。 diff --git a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h index 9e9533a..f2a85a6 100644 --- a/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYCompactUIDiagnostics.inc.h @@ -1,26 +1,24 @@ // Presentation-only changes must never rewrite a host's grading parameters. { DYDiagnosticManager *host=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(host,nil); - DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease];[view refresh];[view setFrameSize:NSMakeSize(400,780)];[view layoutSubtreeIfNeeded]; - NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"];NSView *first=cards.firstObject[@"view"]; - run.record(@"compact-color-settings-hidden-without-gap",panel.hidden&&first.frame.origin.y==8&&[settings.accessibilityLabel isEqual:@"颜色设置"]); - CGFloat foldedHeight=view.intrinsicContentSize.height; - NSView *hostSlot=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,400,406)]autorelease]; - view.frame=hostSlot.bounds;[hostSlot addSubview:view]; - NSDictionary *values=[[host->_values copy]autorelease],*custom=[[host->_custom copy]autorelease];int starts=host->_undoStarts,ends=host->_undoEnds; - [settings performClick:nil];[view layoutSubtreeIfNeeded];run.record(@"compact-color-settings-button-expands-panel",!panel.hidden&&first.frame.origin.y>=NSMaxY(panel.frame)+12&&settings.state==NSControlStateValueOn); - run.record(@"inspector-preferred-height-follows-complete-content",view.intrinsicContentSize.height>foldedHeight); - double layoutDeadline=NSProcessInfo.processInfo.systemUptime+.02; - while(NSProcessInfo.processInfo.systemUptime_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds); - for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults()]){ - DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil];[settings performClick:nil]; - run.record([NSString stringWithFormat:@"compact-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]); + DYInspector *view=[[[DYInspector alloc]initWithAPIManager:host]autorelease]; + NSButton *settings=[view valueForKey:@"colorSettings"];NSView *panel=[view valueForKey:@"managedPanel"];NSArray *cards=[view valueForKey:@"cards"]; + BOOL expanded=YES;NSUInteger visible=0;CGFloat bottom=0; + for(NSDictionary *card in cards)if(![card[@"removed"]boolValue]){expanded&=![card[@"collapsed"]boolValue];visible++;bottom=MAX(bottom,NSMaxY([card[@"view"]frame]));} + NSView *document=[view valueForKey:@"document"];NSView *brandLabel=[view valueForKey:@"brand"]; + run.record(@"inspector-all-existing-modules-expanded-before-host-creation",expanded&&visible==DYToolTypes().count&&!panel.hidden,@{@"visibleModules":@(visible),@"height":@(view.frame.size.height)}); + run.record(@"inspector-returned-frame-contains-complete-expanded-document",NSMaxY(document.frame)<=view.frame.size.height&&bottom<=document.bounds.size.height&&view.frame.size.height==view.intrinsicContentSize.height); + run.record(@"inspector-complete-content-has-no-inner-scroll-view",[view valueForKey:@"scroll"]==nil&&NSContainsRect(view.bounds,brandLabel.frame)); + for(int i=0;i<10;i++){[settings performClick:nil];for(NSDictionary *card in cards)[card[@"header"]performClick:nil];[view layoutSubtreeIfNeeded];} + expanded=YES;for(NSDictionary *card in cards)expanded&=![card[@"collapsed"]boolValue]; + run.record(@"inspector-headers-keep-modules-expanded-without-editing-grade",expanded&&!panel.hidden&&[values isEqual:host->_values]&&[custom isEqual:host->_custom]&&starts==host->_undoStarts&&ends==host->_undoEnds); + DYInspectorToken *folds=[[[DYInspectorToken alloc]init]autorelease];folds.folds=@{@"primary":@YES,@"hsl":@YES};[host setCustomParameterValue:folds toParameter:DYInspectorParameterID atTime:kCMTimeZero]; + [view refresh];expanded=YES;for(NSDictionary *card in cards)expanded&=![card[@"collapsed"]boolValue]; + run.record(@"inspector-old-fold-state-does-not-collapse-new-presentation",expanded&&[DYReadTools(host,kCMTimeZero).document isKindOfClass:NSDictionary.class]); + for(NSDictionary *state in @[@{},DYManagedColorDefaults(),DYPrimaryColorDefaults(),DYUnifiedColorDefaults()]){ + DYAssetState *assets=[[[DYAssetState alloc]init]autorelease];assets.colorManagement=state.count?state:nil;DYWriteAssets(host,assets,kCMTimeZero);[view refresh];NSDictionary *snapshot=[view presetSnapshot];[settings performClick:nil]; + run.record([NSString stringWithFormat:@"expanded-settings-preserve-CMS-version-%@",state[@"version"]?:@1],[[view presetSnapshot]isEqual:snapshot]); } for(NSNumber *width in @[@280,@320,@400]){ [view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES; diff --git a/大鱼调色/Plugin/DYInspector.h b/大鱼调色/Plugin/DYInspector.h index 8b67959..3890688 100644 --- a/大鱼调色/Plugin/DYInspector.h +++ b/大鱼调色/Plugin/DYInspector.h @@ -20,5 +20,4 @@ NSView *DYCreateWorkspaceMaskEditor(id - (instancetype)initWithAPIManager:(id)manager renderer:(DYRenderer *)renderer workspaceType:(NSString *)type; - (void)refresh; - (void)removeWorkspaceTool; -- (void)prepareForHostResize; @end diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 3004240..2c99c17 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -190,8 +190,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) { NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7]; BOOL expanded=self.state==NSControlStateValueOn;DYDrawSoftControl(NSInsetRect(self.bounds,2,3),7,expanded,NO,self.cell.highlighted); NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk()); - [(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes]; - [self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes]; + [self.title drawInRect:NSMakeRect(10,7,MAX(0,r.size.width-18),16) withAttributes:attributes]; } - (void)mouseDown:(NSEvent *)event { if(event.clickCount==2) [NSApp sendAction:self.doubleClickAction to:self.target from:self]; @@ -488,7 +487,7 @@ NSView *DYCreateWorkspaceMaskEditor(id NSInteger _visibleLooks; NSButton *_colorSettings;BOOL _colorSettingsExpanded; BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected; - BOOL _embedded,_workspaceEditor,_unified,_hostResizing;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight; + BOOL _embedded,_workspaceEditor,_unified,_measuringFullHeight;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight; DYSpiderPanel *_spiderPanel; NSMutableDictionary *_assetLoads,*_assetLoadIDs; NSUInteger _nextAssetLoadID; @@ -511,7 +510,7 @@ NSView *DYCreateWorkspaceMaskEditor(id - (instancetype)initWithAPIManager:(id)manager renderer:(DYRenderer *)renderer workspaceType:(NSString *)workspaceType { uint64_t beta=DYBetaSpanBegin(@"inspector_create",nil); if((self=[super initWithFrame:NSMakeRect(0,0,360,406)])) { - _assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=1; + _assetLoads=[NSMutableDictionary new];_assetLoadIDs=[NSMutableDictionary new];_manager=manager; _renderer=[renderer retain];_library=[DYLUTLibrary new];_tabs=[NSMutableDictionary new];_visibleLooks=5; _workspaceEditor=workspaceType.length>0;_embedded=[manager isKindOfClass:DYToolManager.class];if(_embedded)[(id)_manager retain]; _preferredHeight=(_embedded||_workspaceEditor)?780:406; BOOL cstOnly=NO; @@ -534,7 +533,7 @@ NSView *DYCreateWorkspaceMaskEditor(id _save=[DYButton(@"保存预设",self,@selector(savePreset:)) retain]; _load=[DYButton(@"载入预设",self,@selector(loadPreset:)) retain]; _export=[DYButton(@"导出 LUT",self,@selector(exportLUT:)) retain]; - _colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];[_colorSettings setButtonType:NSButtonTypePushOnPushOff];_colorSettings.toolTip=@"展开或收起高级颜色设置;默认使用原有流程";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已收起"; + _colorSettings=[DYButton(@"颜色设置",self,@selector(toggleColorSettings:))retain];_colorSettings.toolTip=@"颜色设置已完整展开;点击定位";_colorSettings.accessibilityLabel=@"颜色设置";_colorSettings.accessibilityValue=@"已展开";_colorSettingsExpanded=YES; _save.identifier=@"primaryAction"; _workspaceButton=[DYButton(@"控制面板",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开调色控制面板"; _addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"]; @@ -556,7 +555,7 @@ NSView *DYCreateWorkspaceMaskEditor(id _document.accessibilityLabel=@"调色参数";_document.identifier=@"inspectorBackground"; if(_scroll){_scroll.documentView=_document;[self addSubview:_scroll];} else [self addSubview:_document]; - if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=YES;[_document addSubview:_managedPanel];} + if(!_embedded&&!_workspaceEditor){_managedPanel=[[DYManagedColorPanel alloc]initWithManager:_manager renderer:_renderer assetTarget:self];_managedPanel.hidden=NO;[_document addSubview:_managedPanel];} [self buildCards]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(modelChanged:) name:@"DYModelChanged" object:_manager]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(themeChanged:) name:DYThemeDidChange object:nil]; @@ -574,7 +573,17 @@ NSView *DYCreateWorkspaceMaskEditor(id // Supply the document's actual height before that snapshot is taken. [self refresh]; [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; - if(!_embedded&&!_workspaceEditor)[self setFrameSize:NSMakeSize(self.frame.size.width,_preferredHeight)]; + if(!_embedded&&!_workspaceEditor){ + // FCP samples the frame once. Measure all expanded modules at the + // narrow supported width and reserve the largest existing tab body. + CGFloat width=self.frame.size.width; + _measuringFullHeight=YES;[self setFrameSize:NSMakeSize(280,_preferredHeight)]; + [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; + CGFloat measured=_preferredHeight; + _measuringFullHeight=NO;[self setFrameSize:NSMakeSize(width,measured)]; + [self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; + _preferredHeight=measured;[self setFrameSize:NSMakeSize(width,measured)]; + } } DYBetaSpanEnd(beta,nil);return self; } @@ -599,12 +608,10 @@ NSView *DYCreateWorkspaceMaskEditor(id - (NSArray *)accessibilityVisibleChildren { return DYAccessibleSubviews(self,YES); } - (NSArray *)accessibilityChildrenInNavigationOrder { return self.accessibilityChildren; } - (NSSize)intrinsicContentSize { return NSMakeSize(360,_preferredHeight); } -- (void)prepareForHostResize {_hostResizing=YES;[self setFrameSize:NSMakeSize(self.frame.size.width,_preferredHeight)];} - (void)viewDidMoveToWindow { [super viewDidMoveToWindow]; - if(!self.window&&!_hostResizing){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];} + if(!self.window){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];} if(self.window) { - _hostResizing=NO; [self refresh]; NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); } @@ -629,9 +636,7 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)showMosaicMenu:(NSView*)sender {[NSNotificationCenter.defaultCenter postNotificationName:@"DYMosaicMenuRequested" object:_manager userInfo:@{@"anchor":sender}];} - (void)selectTheme:(NSButton *)button {DYSetThemeIndex(button.tag);} - (void)toggleColorSettings:(id)sender { - _colorSettingsExpanded=!_colorSettingsExpanded;_managedPanel.hidden=!_colorSettingsExpanded;_colorSettings.state=_colorSettingsExpanded?NSControlStateValueOn:NSControlStateValueOff; - _colorSettings.accessibilityValue=_colorSettingsExpanded?@"已展开":@"已收起";[self setNeedsLayout:YES];[self layoutSubtreeIfNeeded]; - [_document scrollPoint:NSZeroPoint];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); + [_managedPanel scrollRectToVisible:_managedPanel.bounds]; } - (void)openWorkspace:(id)sender { if(_embedded||_workspaceEditor||!self.window||!_renderer)return; @@ -681,7 +686,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [header setButtonType:NSButtonTypePushOnPushOff]; header.bordered=NO; header.alignment=NSTextAlignmentLeft; header.font=[NSFont boldSystemFontOfSize:12]; header.identifier=section[@"key"];header.contentTintColor=DYInk(); header.target=self; header.action=@selector(toggleSection:); header.tag=index; - header.doubleClickAction=@selector(resetSection:); header.toolTip=@"展开或折叠界面;双击还原本组"; + header.doubleClickAction=@selector(resetSection:); header.toolTip=@"本模块已完整展开;双击还原本组"; [card addSubview:header]; NSButton *enabled=DYButton(@"",self,@selector(groupEnabled:));enabled.bordered=NO;[enabled setButtonType:NSButtonTypePushOnPushOff];enabled.image=[NSImage imageWithSystemSymbolName:@"eye" accessibilityDescription:@"启用本组"]; enabled.tag=index; enabled.contentTintColor=DYAccent(); enabled.toolTip=@"启用或旁路本组"; @@ -854,6 +859,15 @@ NSView *DYCreateWorkspaceMaskEditor(id card.hidden=[c[@"removed"]boolValue];if(card.hidden){y=[self layoutRepeatedToolsAfter:[@"base:" stringByAppendingString:key] y:y width:w];continue;} NSArray *body=c[@"body"];CGFloat contentHeight=0; for(NSView *row in body)if([self showRow:row section:key]&&!collapsed)contentHeight+=[self heightForRow:row]; + if(_measuringFullHeight){ + NSNumber *selected=[[_tabs[key]retain]autorelease]; + for(NSInteger tab=0;tab<9;tab++){ + _tabs[key]=@(tab);CGFloat candidate=0; + for(NSView *row in body)if([self showRow:row section:key])candidate+=[self heightForRow:row]; + contentHeight=MAX(contentHeight,candidate); + } + if(selected)_tabs[key]=selected;else[_tabs removeObjectForKey:key]; + } [c[@"enabled"]setFrame:NSMakeRect(12,12,20,20)]; BOOL narrow=cw<300;CGFloat titleWidth=MIN(cw-(narrow?60:171),MAX(94,[[(NSButton *)c[@"header"]title]sizeWithAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:12]}].width+36)); [c[@"header"]setFrame:NSMakeRect(42,8,titleWidth,28)]; @@ -943,20 +957,17 @@ NSView *DYCreateWorkspaceMaskEditor(id _document.frame=NSMakeRect(0,(_embedded||_workspaceEditor)?0:top,documentWidth,_workspaceEditor?_scroll.contentSize.height:y); if(!_embedded&&!_workspaceEditor){ CGFloat preferred=ceil(top+MAX(12,y)); - if(preferred!=_preferredHeight){ - _preferredHeight=preferred; - BOOL attached=self.window!=nil; - // Final Cut snapshots custom-view geometry during creation. Ask - // the plug-in to refresh the host row after the action unwinds. - dispatch_async(dispatch_get_main_queue(),^{ - if(preferred!=self->_preferredHeight)return; - [self invalidateIntrinsicContentSize]; - if(self.frame.size.height!=preferred) - [self setFrameSize:NSMakeSize(self.frame.size.width,preferred)]; - if(attached&&self.window)[NSNotificationCenter.defaultCenter postNotificationName:@"DYInspectorHeightChanged" object:self->_manager userInfo:@{@"view":self}]; - NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); - }); + if(_measuringFullHeight){ + if(_managedPanel)preferred+=MAX(0,238-_managedPanel.contentHeight); + // Switching into V4 adds a separate output header. Reserve that + // existing module's measured rows even while legacy mode hides it. + for(NSDictionary *card in _cards)if([card[@"section"][@"key"]isEqual:@"output"]&&[card[@"removed"]boolValue]){ + CGFloat output=69+8+12;for(NSView *row in card[@"body"])if([self showRow:row section:@"output"])output+=[self heightForRow:row];preferred+=output; + } } + // Never delete/re-create a published parameter to resize its host row. + // The host owns attached geometry; detached/new views can be measured. + if(!self.window){_preferredHeight=MAX(_preferredHeight,preferred);[self invalidateIntrinsicContentSize];} } [self curveOutputChanged:nil]; } @@ -998,11 +1009,11 @@ NSView *DYCreateWorkspaceMaskEditor(id NSNumber *extra=c[@"section"][@"extraEnabled"];double extraValue=0; if(extra)[get getFloatValue:&extraValue fromParameter:extra.unsignedIntValue atTime:t]; BOOL enabled=v>=.5||extraValue>=.5; - DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t]; - NSNumber *saved=[token isKindOfClass:DYInspectorToken.class]?token.folds[c[@"section"][@"key"]]:nil; - BOOL collapsed=_workspaceEditor?NO:saved?saved.boolValue:[c[@"collapsed"]boolValue];groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed); + // Presentation only: retain archived folds for old versions, but + // this inspector opens every existing module before host sizing. + BOOL collapsed=NO;groupingChanged|=collapsed!=[c[@"collapsed"]boolValue];c[@"collapsed"]=@(collapsed); [c[@"header"]setState:collapsed?NSControlStateValueOff:NSControlStateValueOn]; - [c[@"header"]setToolTip:collapsed?@"展开界面,不改变启用状态;双击还原本组":@"折叠界面,保持当前效果;双击还原本组"]; + [c[@"header"]setToolTip:@"本模块已完整展开;双击还原本组"]; [c[@"header"]setAccessibilityHelp:[c[@"header"]toolTip]];[c[@"header"]setNeedsDisplay:YES]; [c[@"enabled"]setState:enabled?NSControlStateValueOn:NSControlStateValueOff]; [c[@"enabled"]setImage:[NSImage imageWithSystemSymbolName:enabled?@"eye":@"eye.slash" accessibilityDescription:enabled?@"停用本组":@"启用本组"]]; @@ -1010,11 +1021,8 @@ NSView *DYCreateWorkspaceMaskEditor(id for(NSView *row in c[@"body"])row.alphaValue=enabled?1:.45; } id maskHost=_embedded?[(DYToolManager*)_manager host]:_manager;NSDictionary *tools=DYReadTools(maskHost,t).document;for(NSDictionary *card in _cards){ - NSString *type=card[@"section"][@"key"];BOOL visible=YES; - if(!_embedded){DYInspectorToken *token=nil;[get getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:t];visible=[tools[@"starterTool"]isEqual:type]||[@[@"primary",@"base",@"spider",@"hsl"]containsObject:type]||[token.folds[[@"visible:" stringByAppendingString:type]]boolValue]; - if(!visible){for(NSDictionary*d in DYBaseToolDescriptors(type)){double value=[d[@"default"]doubleValue];[get getFloatValue:&value fromParameter:[d[@"pid"]unsignedIntValue]atTime:t];if(std::isfinite(value)&&fabs(value-[d[@"default"]doubleValue])>1e-6){visible=YES;break;}}if([tools[@"baseMasks"][type]count])visible=YES;if([type isEqual:@"look"])for(NSString *assetKey in DYReadAssets(_manager,t).paths)if([assetKey hasPrefix:@"look"])visible=YES;} - } - BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&(DYBaseToolRemoved(tools,type)||(!_workspaceEditor&&!visible));groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed); + NSString *type=card[@"section"][@"key"]; + BOOL removed=[type isEqual:@"output"]?!_unified:!_embedded&&DYBaseToolRemoved(tools,type);groupingChanged|=[card[@"removed"]boolValue]!=removed;((NSMutableDictionary *)card)[@"removed"]=@(removed); [card[@"maskPanel"]refreshWithDocument:tools time:t]; NSString *nodeID=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:card[@"section"][@"key"]];NSUInteger count=[DYMasksForTool(tools,nodeID) count]; [(DYMaskCountBadge*)card[@"maskBadge"]setCount:count];NSString *hint=count?[NSString stringWithFormat:@"已有 %lu 个蒙版;点击添加独立蒙版",(unsigned long)count]:@"添加本工具的独立蒙版"; @@ -1131,16 +1139,10 @@ NSView *DYCreateWorkspaceMaskEditor(id - (void)toggleSection:(NSButton *)sender { if(sender.tag<0||sender.tag>=_cards.count)return; if(!_workspaceEditor){id host=_embedded?[(DYToolManager*)_manager host]:_manager;NSString *node=_embedded?[(DYToolManager*)_manager nodeID]:[@"base:" stringByAppendingString:_cards[sender.tag][@"section"][@"key"]];[NSNotificationCenter.defaultCenter postNotificationName:@"DYWorkspaceToolSelection" object:host userInfo:@{@"node":node,@"source":@"inspector"}];} - id action=[self actionAPI];if(!action)return;[action startAction:self]; - @try { - id get=[_manager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)];id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)]; - DYInspectorToken *old=nil;[get getCustomParameterValue:&old fromParameter:DYInspectorParameterID atTime:action.currentTime];DYInspectorToken *token=[old isKindOfClass:DYInspectorToken.class]?[[old copy]autorelease]:[[[DYInspectorToken alloc]init]autorelease]; - NSMutableDictionary *folds=[[token.folds mutableCopy]autorelease]; - for(NSDictionary *card in _cards)folds[card[@"section"][@"key"]]=card[@"collapsed"]; - NSString *key=_cards[sender.tag][@"section"][@"key"];folds[key]=@(![_cards[sender.tag][@"collapsed"]boolValue]);token.folds=folds; - [set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime]; - }@finally{[action endAction:self];}[self postChanged]; + // All modules stay expanded so their initial measured host row remains valid. + [sender setState:NSControlStateValueOn]; } + - (void)useCST:(id)sender { id a=[self actionAPI];if(!a)return;[a startAction:self]; @try{id set=[_manager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];[set setFloatValue:1 toParameter:2236 atTime:a.currentTime];[self clearPrimaryBypasses:set time:a.currentTime];} @finally{[a endAction:self];}[self postChanged]; diff --git a/大鱼调色/Plugin/DYPlugIn.mm b/大鱼调色/Plugin/DYPlugIn.mm index ca49f39..1c70824 100644 --- a/大鱼调色/Plugin/DYPlugIn.mm +++ b/大鱼调色/Plugin/DYPlugIn.mm @@ -21,52 +21,21 @@ @implementation DYPlugIn { DYRenderer *_renderer; NSColorSampler *_canvasSampler; - DYInspector *_inspectorToResize;BOOL _inspectorResizePending; BOOL _copyAnalyzed; 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);_modelRefreshPending.store(false);_apiManager=manager;_renderer=[DYRenderer new];[self initializeToolHost];NSNotificationCenter*n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(inspectorHeightChanged:) name:@"DYInspectorHeightChanged" object:manager];[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];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;} -- (void)dealloc{[_inspectorToResize release];[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_renderer release];[super dealloc];} +- (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];[n addObserver:self selector:@selector(canvasWhiteBalanceRequested:) name:@"DYViewerWhiteBalanceRequested" object:manager];}DYBetaSpanEnd(beta,nil);return self;} +- (void)dealloc{[self tearDownToolHost];[NSNotificationCenter.defaultCenter removeObserver:self];[_canvasSampler release];[_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]; if(pid!=DYInspectorParameterID)return [[NSView alloc]initWithFrame:NSZeroRect]; - if(_inspectorToResize){DYInspector *view=[_inspectorToResize retain];[_inspectorToResize release];_inspectorToResize=nil;[view removeFromSuperview];[view prepareForHostResize];return view;} return [[DYInspector alloc]initWithAPIManager:_apiManager renderer:_renderer]; } -- (void)inspectorHeightChanged:(NSNotification*)notification { - DYInspector *view=notification.userInfo[@"view"]; - if(_inspectorResizePending||![view isKindOfClass:DYInspector.class]||!view.window)return; - idaction=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)]; - idset=[_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];if(!action||!set)return; - _inspectorResizePending=YES;[_inspectorToResize release];_inspectorToResize=[view retain];[view prepareForHostResize]; - const FxParameterFlags flags=kFxParameterFlag_CUSTOM_UI|kFxParameterFlag_USE_FULL_VIEW_WIDTH|kFxParameterFlag_DONT_DISPLAY_IN_DASHBOARD|kFxParameterFlag_NOT_ANIMATABLE; - iddynamic=[_apiManager apiForProtocol:@protocol(FxDynamicParameterAPI_v3)]; - idcreate=[_apiManager apiForProtocol:@protocol(FxParameterCreationAPI_v5)]; - BOOL rebuilt=NO; - [action startAction:self];@try{ - DYInspectorToken *token=nil;[[_apiManager apiForProtocol:@protocol(FxParameterRetrievalAPI_v6)]getCustomParameterValue:&token fromParameter:DYInspectorParameterID atTime:action.currentTime]; - if(dynamic&&create&&[token isKindOfClass:DYInspectorToken.class]){ - token=[[token copy]autorelease];NSError *error=[dynamic removeParameter:DYInspectorParameterID]; - if(!error){ - rebuilt=[create addCustomParameterWithName:@"大鱼调色" parameterID:DYInspectorParameterID defaultValue:token parameterFlags:flags]; - if(rebuilt)[set setCustomParameterValue:token toParameter:DYInspectorParameterID atTime:action.currentTime]; - } - NSLog(@"Dayu inspector row rebuild: %@",rebuilt?@"accepted":error.localizedDescription?:@"creation unavailable"); - } - if(!rebuilt)[set setParameterFlags:(flags&~kFxParameterFlag_CUSTOM_UI)|kFxParameterFlag_HIDDEN toParameter:DYInspectorParameterID]; - }@finally{[action endAction:self];} - if(rebuilt){_inspectorResizePending=NO;return;} - // Some hosts only expose presentation flags. Give that transaction a display - // cycle before restoring the custom view, avoiding coalesced hide/show updates. - dispatch_after(dispatch_time(DISPATCH_TIME_NOW,(int64_t)(.2*NSEC_PER_SEC)),dispatch_get_main_queue(),^{ - [action startAction:self];@try{[set setParameterFlags:flags toParameter:DYInspectorParameterID];}@finally{[action endAction:self];self->_inspectorResizePending=NO;} - }); -} - (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. diff --git a/大鱼调色/Plugin/DYToolInspector.inc.h b/大鱼调色/Plugin/DYToolInspector.inc.h index a16e9b4..6da7ee8 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||_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;} +- (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->_measuringFullHeight=_measuringFullHeight;child.frame=NSMakeRect(0,y,w,MAX(60,child->_stackHeight));[child setNeedsLayout:YES];[child layoutSubtreeIfNeeded];child->_measuringFullHeight=NO;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/Info.plist b/大鱼调色/Plugin/Info.plist index 73fc4a5..75f5ccf 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.17.0 CFBundleVersion - 101 + 102 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 7a282fd..17b3334 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.17.0 CFBundleVersion - 101 + 102 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright