fix: refresh host custom row when inspector content height changes

这个提交包含在:
mac 于 2026-11-06 13:32:10 +08:00 提交
1 父节点 dc56d0b321
当前提交 cf5954a927
5 个文件已更改
+104 -17

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

+71
查看文件
@@ -0,0 +1,71 @@
{
"status": "rejected-host-dynamic-height",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.17.0",
"build": "99",
"team": "B3W25FX5H5",
"notaryID": "7eee4b2c-4095-4cab-b8af-828473f4e211",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "dc56d0b321c2080565f9a2d21597a17923e7b4b5",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"installedTemplateSHA256": {
"大鱼调色/大鱼调色.moef": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"大鱼调色/large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"大鱼调色/small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a",
"一级调色/一级调色.moef": "50e772b3670563ddce99fa2de63d87e5a14c81a8b7e37f15be32836c59ddafcb",
"一级调色/large.png": "b9b990a46f3fd9b6974a1aba1a3e9bff11a287fd1615d4cd0f9e7393c302631b",
"一级调色/small.png": "77b36c042fb82219651e5bd22c1057b644c06a528a8962d4afecdcb8cab52635",
"蜘蛛盘校色仪/蜘蛛盘校色仪.moef": "3c2af55314cdc4457bb3300138caa4ed87b5e6d9ec8dc2d2e3ba208bbacfd1a8",
"蜘蛛盘校色仪/large.png": "52de21d5fc598fda331cd472b937cf4aaf69a09c80d49e7b168ac7804e9cd040",
"蜘蛛盘校色仪/small.png": "ea9b69d12948c5cd5f6acd9d000822d9fff6df3beec9dd278077a8ab66d455cd",
"基础调整/基础调整.moef": "4a6b336349974fb0395d5218aeb501095eab7d501236fd238f9916cbf2071a12",
"基础调整/large.png": "a25e2b5ed50628ebe77220719528d14f21c25b5eecf37a5d60f211d2179ece43",
"基础调整/small.png": "3da91ae3461b882f5e1a557b4191d9aedaa6d329da70999eb7f26cbfb63a057f",
"肤色保护/肤色保护.moef": "83990f9e58c8ce1a59e4e52c597bd16831af94c3be679c53e9283fb04dd42cef",
"肤色保护/large.png": "f124e8f3d93c2be76ba26ba06d8b9c0b42e2c10dcb6300ae6ee7b7d7c7eb3025",
"肤色保护/small.png": "51fe525e67903101920a994d3540f368780d3aa9c0e54ebdb847871c82d81562",
"风格 LUT/风格 LUT.moef": "d424258d579c049df95ce361cee5373b7dc7d5a4f21cff5b1dd24adcdbc19942",
"风格 LUT/large.png": "a9a4b48885752282535ec3ec2ffbe19bcd27af7132337e4a4ad3d104a2082692",
"风格 LUT/small.png": "9ae76ba957b1e94a5a03a600140f59e98861917d13da9124082810c509400e36",
"HSL/HSL.moef": "baf84ec3b719c3a369ef0760713ba44b203bbfd0821c7a8d68919fef57d58fda",
"HSL/large.png": "eaa2e7b025dc59416fddb8de8b9c56f0a7d34ba70facd7aa45cfb84660f7da78",
"HSL/small.png": "3a54428bc6821e75935aa1be0f149aac6e6ce05fcc059b7f0e90ceef9a41981e",
"曲线/曲线.moef": "b2737c1b39fa039ee7876f3b473943168a15da65459b00802262a931feca3674",
"曲线/large.png": "273899eb6aa60fc0f7c8d41cc0e1f5a15b4c88a8803c00020a085ea874160870",
"曲线/small.png": "c17a2343b076650344b1c53ce92acf32f7696d66e32bda2d156996d4e3b834f5",
"颜色分级/颜色分级.moef": "9fe0319d878b8885d62e199bdea67d804e76f14104bcd233e33be22d60d1ad13",
"颜色分级/large.png": "f9afe6c3a76080a2a7c7ea98f24e62a74ab2e6fd8b4ad16ba9eb6065fef5d2ed",
"颜色分级/small.png": "9e9d7759f829d25a01a77422c989949b02ad34de81013f6b91505c4a3d1397e9",
"三原色/三原色.moef": "80894559be59396d6e06adc8d3343339cbf76f56bed12797446cbb568d6e10de",
"三原色/large.png": "bf7bfc893e294fc38c0f97e5594b6ba6e5c7126b9aae643754c89647e8bd5a1f",
"三原色/small.png": "2e28988e6bae0503edadef22cf7793ce51a1b8e5930623b2eff3c01212e57ee8",
"色阶/色阶.moef": "885c51e81f270078b6c05978a98e7d55ccafc7cd41035b0adbda068cb7149f2d",
"色阶/large.png": "fcea12f4367039ea1512d2e23d51b9ca5198172dc5b10a1ff94a828fe94f4802",
"色阶/small.png": "41cd1a9c4d3b68972181534abe0e91bdb9e01ef5559b6b1f7ef6bf305f450a76",
"黑白混色/黑白混色.moef": "6a7de91a44cd22aa5689c9aad725dccc7e4a29b6dd4e69a4158da7d02f7e559b",
"黑白混色/large.png": "6df07fb223ab43b2b5b6115bef4a1a97eed5cbeb6afab84e005c3a2bdfe01979",
"黑白混色/small.png": "5382be0d29b4a195b8639b3c325f80e9b8cecaa9c12837ab5cf57b6ea877ecbc",
"色彩平衡/色彩平衡.moef": "175ed9f890adf13e712dec264068fffde11accf6dc2e33c3bb278c4438f68362",
"色彩平衡/large.png": "fa2ce9071dee52d7ab9dc7cf6020f8679df3af707663c9a57a28fcde73e6801e",
"色彩平衡/small.png": "12a72a9f26e6ee41613b16ed2402f94a04837e55895addc8f5c25137ad7feaa6",
"通道混合器/通道混合器.moef": "06f497fffbcee034cfbf21e7f39a4b10e41ad49cafd0476f4825903e9169521d",
"通道混合器/large.png": "5ae9d2683450a3a515822520911885a774e202aa924465602f7369a1e67c0c4c",
"通道混合器/small.png": "23bfafb79287855e037f98f0ab5cee10914384824b1a65f0247cad2dd239ef1c",
"胶片模拟/胶片模拟.moef": "528835a129e158c9edf2b48d4a9521b2b9a40e845f04160eecd56e125473bbde",
"胶片模拟/large.png": "d36a794f9640874f6ad7f3523b9eac92ba7c6ef8fa7b63c4594fc68e87c2eee7",
"胶片模拟/small.png": "f125deaf0c8d55ecc04e555cfb133c40ff3703f34a663548c6b38b3196780eb1",
"镜头畸变修复/镜头畸变修复.moef": "0a75525f6e2203527f20a2945aac1a262aa2db57683065ab0ca793da7f5ecd0a",
"镜头畸变修复/large.png": "a00136fb9276c41518ba6096314fb6772ad1dc9be4f4d766409239fa923cfcd1",
"镜头畸变修复/small.png": "1b2480cfa33e1ab54a1ffcd81d9496aac1354b0d2974d6616fe7128965c2ede3",
"CST 色彩空间转换/CST 色彩空间转换.moef": "1399d6906748b206b2673a1d8460f83d9ddda07722d2214d85a9909f24171c17",
"CST 色彩空间转换/large.png": "816db272970491181aca4b872f09ca1900ebf0e7f21fee5bd6e2b4daedea5306",
"CST 色彩空间转换/small.png": "677353684eeaa1986bd21580eb0f2dcf4486f8cfba3985686c2ecb67afed5dbc"
},
"shaderSHA256": "443ef7e178a5bbd6418a4d2eaac5d42f023f1a6a0a5c4ddd54c7c831af50eb6a",
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6269d816ab0444c0bee5fde43edc61d2.app",
"reason": "Initial complete height visible; folding resized service container only and left FCP host row unchanged; not released.",
"restoredBuild": "97"
}
+8 -12
查看文件
@@ -488,7 +488,7 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
NSInteger _visibleLooks;
NSButton *_colorSettings;BOOL _colorSettingsExpanded;
BOOL _refreshing,_graphicUndoOpen,_graphicCancelled;CMTime _graphicTime;NSMutableDictionary *_graphicExpected;
BOOL _embedded,_workspaceEditor,_unified;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight;
BOOL _embedded,_workspaceEditor,_unified,_hostResizing;NSArray *_renderOrder;NSMutableDictionary *_stackViews;NSArray *_stackOrder;NSDictionary *_stackRoots;CGFloat _stackHeight,_preferredHeight;
DYSpiderPanel *_spiderPanel;
NSMutableDictionary *_assetLoads,*_assetLoadIDs;
NSUInteger _nextAssetLoadID;
@@ -598,10 +598,12 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
- (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){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];}
if(!self.window&&!_hostResizing){[self graphicGesture:NO title:nil];[self cancelAssetLoads];[_workspace close];}
if(self.window) {
_hostResizing=NO;
[self refresh];
NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
}
@@ -941,21 +943,15 @@ NSView<DYWorkspaceMaskEditing> *DYCreateWorkspaceMaskEditor(id<PROAPIAccessing>
CGFloat preferred=ceil(top+MAX(12,y));
if(preferred!=_preferredHeight){
_preferredHeight=preferred;
// Notify ViewBridge after the parameter action has unwound. The
// entire document has one natural height; only the host scrolls.
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)];
// FxPlug places the custom view in a service-controller root.
// Keep that root at the same natural size as its sole child.
NSView *container=self.superview;
if(container.subviews.count==1&&container.subviews.firstObject==self){
[container setFrameSize:NSMakeSize(container.frame.size.width,preferred)];
self.frame=NSMakeRect(0,0,self.frame.size.width,preferred);
}
[container setNeedsLayout:YES];
if(attached&&self.window)[NSNotificationCenter.defaultCenter postNotificationName:@"DYInspectorHeightChanged" object:self->_manager userInfo:@{@"view":self}];
NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification);
});
}
+23 -3
查看文件
@@ -21,17 +21,37 @@
@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<PROAPIAccessing>)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];}
- (instancetype)initWithAPIManager:(id<PROAPIAccessing>)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];}
- (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<Class>*)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];}
- (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;
id<FxCustomParameterActionAPI_v4>action=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];
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(),^{
[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.
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.0</string>
<key>CFBundleVersion</key>
<string>99</string>
<string>100</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.0</string>
<key>CFBundleVersion</key>
<string>99</string>
<string>100</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>