fix: refresh host custom row when inspector content height changes
这个提交包含在:
1 父节点
dc56d0b321
当前提交
cf5954a927
5 个文件已更改
+104
-17
没有与搜索条件相匹配的文件
+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>
|
||||
|
||||
在新工单中引用
屏蔽一个用户