fix: recreate measured custom parameter row and add accessible mosaic entry

这个提交包含在:
mac 于 2026-11-06 13:44:09 +08:00 提交
1 父节点 3c96507971
当前提交 2c2af3695b
7 个文件已更改
+113 -22

没有与搜索条件相匹配的文件

+6 -4
查看文件
@@ -470,7 +470,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
DYManagedColorPanel *_managedPanel;
NSTextField *_brand;
NSTextField *_subtitle;
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink;
NSButton *_resetAll, *_save, *_load, *_export, *_websiteLink, *_mosaicButton;
NSPopUpButton *_addModule;
NSArray *_sections;
NSMutableArray *_cards;
@@ -539,7 +539,8 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
_workspaceButton=[DYButton(@"控制面板",self,@selector(openWorkspace:))retain];_workspaceButton.accessibilityLabel=@"打开调色控制面板";
_addModule=[[DYThemePopUpButton alloc]initWithFrame:NSZeroRect pullsDown:YES];_addModule.font=[NSFont systemFontOfSize:11];_addModule.accessibilityLabel=@"添加模块";[_addModule addItemWithTitle:@"+ 添加模块"];
for(NSDictionary *section in DYPresentationSections(NO,NO)){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton]){[self addSubview:v];v.hidden=_embedded||_workspaceEditor;}
_mosaicButton=[DYButton(@"局部马赛克",self,@selector(showMosaicMenu:))retain];_mosaicButton.accessibilityLabel=@"局部马赛克";_mosaicButton.toolTip=@"选择人脸或已绘制蒙版,并调整马赛克方块大小";
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule,_workspaceButton,_mosaicButton]){[self addSubview:v];v.hidden=_embedded||_workspaceEditor;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
NSButton *b=DYButton(DYThemeNames()[i],self,@selector(selectTheme:));[b setButtonType:NSButtonTypePushOnPushOff];b.tag=i+7;b.identifier=@"appearanceToggle";
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded||_workspaceEditor;[themes addObject:b];
@@ -584,7 +585,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
[[NSNotificationCenter defaultCenter] removeObserver:self];[NSWorkspace.sharedWorkspace.notificationCenter removeObserver:self];
if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release];[_renderOrder release];
[_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release];
[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
[_mosaicButton release];[_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release];
[_recentBrowser close];[_recentBrowser release];[_recentHost release];
[_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];[_graphicExpected release];
[super dealloc];
@@ -625,6 +626,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
id<FxUndoAPI>undo=[_manager apiForProtocol:@protocol(FxUndoAPI)];if([undo startUndoGroup:@"移动输出转换层"]){DYWriteTools(_manager,doc,a.currentTime);[undo endUndoGroup];}
}@finally{[a endAction:self];}[self postChanged];
}
- (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;
@@ -843,7 +845,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
NSArray *actions=@[_save,_load,_export,_colorSettings];for(NSUInteger i=0;i<actions.count;i++)[actions[i]setFrame:NSMakeRect(16+(bw+gap)*(compact?i%2:i),74+(compact?i/2*34:0),bw,27)];
CGFloat top=(compact?178:144)+34;_workspaceButton.frame=NSMakeRect(16,top-70,w-32,27);_addModule.frame=NSMakeRect(16,top-36,w-32,27);
CGFloat top=(compact?178:144)+34;_workspaceButton.frame=NSMakeRect(16,top-70,w-32,27);_addModule.frame=NSMakeRect(16,top-36,w-145,27);_mosaicButton.frame=NSMakeRect(w-122,top-36,106,27);
_scroll.frame=(_embedded||_workspaceEditor)?NSMakeRect(0,0,w,h):NSMakeRect(0,top,w,MAX(0,h-top));
CGFloat cw=MAX(244,(_scroll?_scroll.contentSize.width:w)-32),y=8;
if(_managedPanel&&!_managedPanel.hidden){_managedPanel.frame=NSMakeRect(28,y,cw-24,_managedPanel.contentHeight);y+=_managedPanel.contentHeight+12;}
+19 -4
查看文件
@@ -45,10 +45,25 @@
id<FxParameterSettingAPI_v6>set=[_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;
[action startAction:self];@try{[set setParameterFlags:(flags&~kFxParameterFlag_CUSTOM_UI)|kFxParameterFlag_HIDDEN toParameter:DYInspectorParameterID];}@finally{[action endAction:self];}
// Separate transactions let the host retire the old custom-UI row. Its
// replacement uses the same view and parameter value at the measured height.
dispatch_async(dispatch_get_main_queue(),^{
id<FxDynamicParameterAPI_v3>dynamic=[_apiManager apiForProtocol:@protocol(FxDynamicParameterAPI_v3)];
id<FxParameterCreationAPI_v5>create=[_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;}
});
}
@@ -21,6 +21,7 @@
- (void)invalidate;
- (void)requestWorkspace;
- (void)requestMosaicMenu;
- (void)requestMosaicMenuFromView:(NSView*)anchor;
- (void)requestWorkspacePage:(NSString *)page;
- (void)requestMask:(NSInteger)kind;
- (void)requestTool:(NSString*)type;
@@ -79,7 +80,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
}
@synthesize renderer=_renderer;
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)manager {
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];}return self;
if((self=[super init])){_apiManager=manager;_snapshotTime=kCMTimeInvalid;_writerTime=kCMTimeInvalid;[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(workspaceSelected:) name:@"DYWorkspaceToolSelection" object:manager];[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(mosaicMenuRequested:) name:@"DYMosaicMenuRequested" object:manager];}return self;
}
- (void)dealloc {
// invalidate enqueues closure before the owner releases its final reference;
@@ -118,7 +119,9 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
}@finally{[a endAction:self];}
[_renderer invalidatePreview];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:manager];
}
- (void)requestMosaicMenu {
- (void)mosaicMenuRequested:(NSNotification*)note {[self requestMosaicMenuFromView:note.userInfo[@"anchor"]];}
- (void)requestMosaicMenu {[self requestMosaicMenuFromView:nil];}
- (void)requestMosaicMenuFromView:(NSView*)anchor {
dispatch_async(dispatch_get_main_queue(),^{
id manager=nil;@synchronized(self){if(!self->_invalidated)manager=self->_apiManager;}if(!manager)return;
id<FxCustomParameterActionAPI_v4>a=[manager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];[a startAction:self];NSDictionary *doc=nil;
@@ -134,7 +137,7 @@ static BOOL DYViewerSanitizeValue(NSDictionary *d,double input,double *output) {
[menu addItem:NSMenuItem.separatorItem];
for(NSNumber *size in @[@8,@16,@32,@64,@96,@128])add([NSString stringWithFormat:@"方块大小:%@",size],@{@"size":size},[settings[@"size"]isEqual:size]);
[menu addItem:NSMenuItem.separatorItem];add(@"关闭局部马赛克",@{@"enabled":@NO},![settings[@"enabled"]boolValue]);
[doc release];[menu popUpMenuPositioningItem:nil atLocation:NSEvent.mouseLocation inView:nil];
[doc release];[menu popUpMenuPositioningItem:nil atLocation:anchor?NSMakePoint(0,NSMaxY(anchor.bounds)):NSEvent.mouseLocation inView:anchor];
});
}
- (void)requestWorkspace{
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.0</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>101</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>