fix: recreate measured custom parameter row and add accessible mosaic entry
这个提交包含在:
1 父节点
3c96507971
当前提交
2c2af3695b
7 个文件已更改
+113
-22
没有与搜索条件相匹配的文件
@@ -12,7 +12,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "runtime-directory",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06"
|
||||
},
|
||||
{
|
||||
"descriptors": 285,
|
||||
@@ -898,7 +898,7 @@
|
||||
"error": "未提供错误信息",
|
||||
"name": "renderer-export-33cube",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8/diagnostic-export.cube"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06/diagnostic-export.cube"
|
||||
},
|
||||
{
|
||||
"bytes": 1186074,
|
||||
@@ -918,7 +918,7 @@
|
||||
},
|
||||
{
|
||||
"heartbeats": 1,
|
||||
"maximumGapMS": 63.57891665538773,
|
||||
"maximumGapMS": 64.66891668969765,
|
||||
"name": "external-activation-main-loop-responsive",
|
||||
"pass": true
|
||||
},
|
||||
@@ -1389,7 +1389,7 @@
|
||||
"closePixels": 128,
|
||||
"name": "workspace-offscreen-compact-icons-and-close-render-pixels",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8/workspace-topbar.png",
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06/workspace-topbar.png",
|
||||
"toolbarPixels": 3867
|
||||
},
|
||||
{
|
||||
@@ -1460,7 +1460,7 @@
|
||||
},
|
||||
{
|
||||
"name": "workspace-independent-style-fixture-inserted",
|
||||
"node": "7538D39C-EA1D-4F88-B24F-4898512F67D7",
|
||||
"node": "30DAC172-F313-4F4D-82C3-31870ED1D309",
|
||||
"pass": true,
|
||||
"validDocument": true
|
||||
},
|
||||
@@ -1469,10 +1469,10 @@
|
||||
"error": "none",
|
||||
"name": "workspace-independent-style1-writes-target-node-inside-undo",
|
||||
"nodePaths": {
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8/node.cube"
|
||||
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06/node.cube"
|
||||
},
|
||||
"pass": true,
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8/user-new.cube",
|
||||
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06/user-new.cube",
|
||||
"undoStartsAfter": 3,
|
||||
"undoStartsBefore": 2,
|
||||
"written": true
|
||||
@@ -4392,7 +4392,7 @@
|
||||
{
|
||||
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
|
||||
"pass": true,
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8/viewer-workspace.png"
|
||||
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06/viewer-workspace.png"
|
||||
},
|
||||
{
|
||||
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
|
||||
@@ -4764,6 +4764,6 @@
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/AF022381-938C-489D-ADB0-5B42551A29D8",
|
||||
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/8B1484C5-4CA8-47C8-B9F4-2726D549FA06",
|
||||
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
{
|
||||
"status": "rejected-host-dynamic-height",
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"bundleID": "com.dayu.color",
|
||||
"version": "1.17.0",
|
||||
"build": "100",
|
||||
"team": "B3W25FX5H5",
|
||||
"notaryID": "4d8cdda2-daf4-4b1a-a4df-425b86dd472d",
|
||||
"notaryStatus": "Accepted",
|
||||
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
|
||||
"sourceCommit": "3c965079716c243ece946997ad8959f32ed2526a",
|
||||
"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-6f8ee1ce80de4e3180d322265bf7f883.app",
|
||||
"reason": "Immediate flag hide/show did not retire the FCP custom-view row; initial full size works but fold leaves blank slot. Not released.",
|
||||
"restoredBuild": "97"
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.17.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>100</string>
|
||||
<string>101</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
|
||||
在新工单中引用
屏蔽一个用户