diff --git a/research/UnifiedPipeline1.17.0.md b/research/UnifiedPipeline1.17.0.md index 1c88a7b..4209441 100644 --- a/research/UnifiedPipeline1.17.0.md +++ b/research/UnifiedPipeline1.17.0.md @@ -18,3 +18,7 @@ 948 项 Release 原生检查中,新链路与马赛克检查全部通过;唯一失败是旧界面把输出卡片数量固定为零的断言,已按兼容隐藏/V4 独立卡片调整。新增场景曝光负值、超白翻倍检查纳入最终验证。输出层在控制面板使用同一渲染次序,一级旁路不再联动输入和输出,人脸肤色支持在 V4 当前节点参考图上重新生成。 原模板 custom dataValue 不能改成 V4 默认:FCP 会将其应用于已有 nil 状态效果,导致旧工程变化。继续保留旧载体,颜色设置中显式选择“全链路 · 输出转换层”;新流程输出默认为 tail。不得宣称所有旧效果自动迁移。版本准备为 1.17.0(98)。 + +## 宿主高度修复(99) + +98 通过 950 项原生检查及公证,但 FCP 12.4 宿主验收发现初始 406 pt 槽位裁切,未发布,正式安装回滚到 97。只读检查 FxPlug 与 ProAppsFxSupport 的 arm64 发布二进制确认创建时仅传递一次 frame,updateCustomViews 只标记重绘。99 在返回自定义视图之前读取折叠状态并完成布局,随后同步服务容器尺寸。动态展开仍须实际宿主验证,不能用原生模拟容器替代。REA 证据快照保存在固定构建缓存,未复制 Apple 二进制或实现到项目。 diff --git a/tools/create_unified_host_fixture.py b/tools/create_unified_host_fixture.py new file mode 100644 index 0000000..3569877 --- /dev/null +++ b/tools/create_unified_host_fixture.py @@ -0,0 +1,35 @@ +#!/usr/bin/env python3 +"""Isolated 1.17 host fixture, using the project's public-domain portrait.""" +from pathlib import Path +import base64, json, plistlib, uuid +import xml.etree.ElementTree as E +root=Path(__file__).resolve().parent.parent +qa=Path.home()/'Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/unified-1.17.0' +qa.mkdir(parents=True,exist_ok=True) +portrait=root/'tools/fixtures/astronaut.png' +model=json.loads((root/'template/sources/RegisteredParameters.json').read_text()) +values={r['key']:r['default'] for r in model['parameters']} +values.update(cmConfigured=1,cminputGamut=22,cminputTransfer=1003,cmworkingGamut=22,cmworkingTransfer=1003,cmoutputGamut=22,cmoutputTransfer=1003,cmtoneMapping=0,skinEnabled=0,inputProfile=0,preLUTStrength=0) +assert set(values)<=set(r['key'] for r in model['parameters']) +spider=json.loads((root/'research/cms-correction-20261104/neutral-spider.json').read_text()) +for name,mosaic in [('全链路中性',False),('人脸马赛克',True)]: + tools=dict(schema=3,layers=[],baseMasks={},sharedMasks=[],outputAfter='tail') + if mosaic:tools['mosaic']=dict(enabled=True,source='face',size=64) + preset=dict(format='com.dayu.color.preset',version=7,colorManagement=dict(version=4,mode=5,engine='Dayu-CST-f32',config='ordered-working-domain-v1'),values=values,paths={},spider=spider,tools=base64.b64encode(plistlib.dumps(tools,fmt=plistlib.FMT_BINARY)).decode()) + (qa/(name+'.json')).write_text(json.dumps(preset,ensure_ascii=False,indent=2)+'\n') +doc=E.Element('fcpxml',version='1.12');r=E.SubElement(doc,'resources') +E.SubElement(r,'format',id='f1',width='1920',height='1080',frameDuration='1/25s',colorSpace='1-1-1 (Rec. 709)') +E.SubElement(r,'format',id='f2',width='512',height='512',name='FFVideoFormatRateUndefined') +a=E.SubElement(r,'asset',id='a1',name='astronaut',start='0s',duration='0s',hasVideo='1',videoSources='1',format='f2') +E.SubElement(a,'media-rep',kind='original-media',src=portrait.resolve().as_uri()) +template=Path.home()/'Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef' +E.SubElement(r,'effect',id='fx',name='大鱼调色',uid='~/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef',src=template.as_uri()) +event=E.SubElement(E.SubElement(doc,'library'),'event',name='大鱼调色1.17.0全链路与马赛克验收',uid=str(uuid.uuid5(uuid.NAMESPACE_URL,'dayu-color/unified-1.17')).upper()) +for title in ['1.17.0 自适应与输出层','1.17.0 人脸与蒙版马赛克']: + project=E.SubElement(event,'project',name=title,uid=str(uuid.uuid5(uuid.NAMESPACE_URL,title)).upper()) + sequence=E.SubElement(project,'sequence',format='f1',duration='4s',tcStart='0s',tcFormat='NDF',audioLayout='stereo',audioRate='48k') + clip=E.SubElement(E.SubElement(sequence,'spine'),'video',ref='a1',name='astronaut',offset='0s',start='0s',duration='4s') + E.SubElement(clip,'filter-video',ref='fx',name='大鱼调色',enabled='1') +E.indent(doc);output=qa/'全链路与马赛克验收.fcpxml' +output.write_text('\n\n'+E.tostring(doc,encoding='unicode')+'\n') +print(output) diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 993c79d..668b7a7 100644 --- a/verification/InstalledSelfTest.json +++ b/verification/InstalledSelfTest.json @@ -1,6 +1,6 @@ { "bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit", - "checks": 922, + "checks": 950, "gpu": "Apple M4", "limitations": [ "Finite states and a 64x48 frame; live FCP discovery, inspector interaction, timeline persistence and real host export require separate acceptance.", @@ -12,7 +12,7 @@ "error": "未提供错误信息", "name": "runtime-directory", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1" }, { "descriptors": 285, @@ -121,7 +121,7 @@ "pass": true }, { - "modules": 15, + "modules": 16, "name": "default-only-primary-spider-base-hsl-visible-and-collapsed", "pass": true }, @@ -898,7 +898,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1/diagnostic-export.cube" }, { "bytes": 1186074, @@ -918,7 +918,7 @@ }, { "heartbeats": 1, - "maximumGapMS": 63.300583336967975, + "maximumGapMS": 64.28333331132308, "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/0658DC27-6627-47D1-B4BF-18861E03DDBD/workspace-topbar.png", + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1/workspace-topbar.png", "toolbarPixels": 3867 }, { @@ -1460,7 +1460,7 @@ }, { "name": "workspace-independent-style-fixture-inserted", - "node": "970DB047-5690-4026-AD31-B2CE7AC2CCD1", + "node": "E898A918-1034-4F05-89F4-FD683AB70B0A", "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/0658DC27-6627-47D1-B4BF-18861E03DDBD/node.cube" + "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1/node.cube" }, "pass": true, - "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD/user-new.cube", + "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1/user-new.cube", "undoStartsAfter": 3, "undoStartsBefore": 2, "written": true @@ -2799,7 +2799,7 @@ "pass": true }, { - "coveredPixels": 16088, + "coveredPixels": 17041, "name": "native-osc-real-metal-overlay-transparent-around-controls", "pass": true }, @@ -2879,7 +2879,7 @@ }, { "name": "native-osc-renders-the-cropped-toolbar-on-a-transparent-texture", - "opaquePixels": 12264, + "opaquePixels": 13217, "pass": true }, { @@ -3860,6 +3860,129 @@ "name": "primary-Cube-restores-output-gamma-selection", "pass": true }, + { + "name": "unified-v4-valid-and-distinct-from-v3", + "pass": true + }, + { + "name": "unified-default-output-is-last", + "pass": true + }, + { + "name": "unified-output-follows-stable-uuid", + "pass": true + }, + { + "name": "unified-deleting-anchor-keeps-valid-output-order", + "pass": true + }, + { + "name": "unified-rejects-unknown-output-anchor", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "unified-neutral-wide-chain-renders", + "pass": true + }, + { + "name": "unified-neutral-preserves-negative-and-superwhite", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "unified-scene-exposure", + "pass": true + }, + { + "blue": 7.99609375, + "name": "unified-scene-exposure-doubles-negative-and-superwhite", + "pass": true, + "red": -0.0799560546875 + }, + { + "error": "未提供错误信息", + "name": "unified-HSL-before-output-accepts-linear-domain", + "pass": true + }, + { + "name": "unified-active-bounded-tool-carries-superwhite-residual", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "unified-zero-mask", + "pass": true + }, + { + "name": "unified-zero-mask-is-exact-neutral", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "unified-last-output", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "unified-middle-output", + "pass": true + }, + { + "difference": 0.01904296875, + "name": "unified-moving-output-changes-actual-domain-order", + "pass": true + }, + { + "name": "unified-inspector-output-visible-at-chain-tail", + "pass": true + }, + { + "name": "unified-output-arrow-persists-and-creates-one-undo", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mosaic-baseline", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mosaic-shared-rectangle-render", + "pass": true + }, + { + "inside": 0.39990234375, + "name": "mosaic-changes-selection-and-preserves-outside", + "outside": 0, + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mosaic-follow-existing-tracking", + "pass": true + }, + { + "name": "mosaic-tracked-selection-vacates-previous-region", + "pass": true + }, + { + "error": "未提供错误信息", + "name": "mosaic-missing-mask", + "pass": true + }, + { + "name": "mosaic-missing-mask-does-not-cover-whole-frame", + "pass": true + }, + { + "name": "mosaic-refuses-incomplete-cube-export", + "pass": true + }, + { + "name": "mosaic-invalid-block-size-rejected", + "pass": true + }, { "name": "compact-color-settings-hidden-without-gap", "pass": true @@ -3869,11 +3992,11 @@ "pass": true }, { - "name": "inspector-preferred-height-follows-content-with-a-scroll-cap", + "name": "inspector-preferred-height-follows-complete-content", "pass": true }, { - "name": "inspector-hosted-slot-keeps-header-visible-and-scrolls-only-overflow", + "name": "inspector-grows-with-content-and-has-no-inner-scroll-view", "pass": true }, { @@ -4128,7 +4251,7 @@ "pass": true }, { - "name": "viewer-lower-right-rail-has-seven-image-tools-and-three-persistent-mask-shapes", + "name": "viewer-lower-right-rail-has-eight-image-tools-and-three-persistent-mask-shapes", "pass": true }, { @@ -4136,10 +4259,10 @@ "pass": true }, { - "canvasPixelFraction": 0.017447916666666667, + "canvasPixelFraction": 0.018740354938271604, "name": "viewer-idle-4k-toolbar-rasterizes-under-five-percent-of-the-canvas", "overlayHeight": 134, - "overlayWidth": 1080, + "overlayWidth": 1160, "pass": true }, { @@ -4269,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/0658DC27-6627-47D1-B4BF-18861E03DDBD/viewer-workspace.png" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1/viewer-workspace.png" }, { "name": "canvas-hsl-plot-captures-outside-and-commits-one-undo", @@ -4391,6 +4514,12 @@ "name": "face-multiple-people-build-independent-support-regions", "pass": true }, + { + "backgroundChange": 0, + "faceChange": 0.6928863525390625, + "name": "mosaic-real-face-includes-feature-region-and-excludes-background", + "pass": true + }, { "error": "", "name": "face-none-protected-render", @@ -4635,6 +4764,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/0658DC27-6627-47D1-B4BF-18861E03DDBD", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/85957E4B-D58C-43FE-A256-BF6B2A98DDD1", "scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document." } diff --git a/verification/RejectedBuild98.json b/verification/RejectedBuild98.json new file mode 100644 index 0000000..d64461e --- /dev/null +++ b/verification/RejectedBuild98.json @@ -0,0 +1,71 @@ +{ + "status": "host-layout-failed-rolled-back", + "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "bundleID": "com.dayu.color", + "version": "1.17.0", + "build": "98", + "team": "B3W25FX5H5", + "notaryID": "8a8ce0ff-211a-4cca-bf2c-7b9a16c5cbd4", + "notaryStatus": "Accepted", + "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", + "sourceCommit": "0a1987572b1f1f79a8fc4035a09206bcb7586350", + "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-14cdeebcaf5f47bda2b7bdb9400d120c.app", + "reason": "FCP initial custom view slot remained 406 points; long view top clipped.", + "restoredVersion": "1.16.0 (97)" +} diff --git a/verification/UnifiedFixture1.17.0.json b/verification/UnifiedFixture1.17.0.json new file mode 100644 index 0000000..bcb74cd --- /dev/null +++ b/verification/UnifiedFixture1.17.0.json @@ -0,0 +1,22 @@ +{ + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/unified-1.17.0/全链路与马赛克验收.fcpxml", + "status": "pass", + "dtd": "/Applications/Final Cut Pro.app/Contents/Frameworks/Interchange.framework/Versions/A/Resources/FCPXMLv1_12.dtd", + "errors": [], + "warnings": [], + "checks": { + "dtd": true, + "xml": true, + "local_media": { + "checked": 1, + "missing": 0 + } + }, + "version": "1.12", + "summary": { + "projects": 2, + "assets": 1, + "elements": 19 + }, + "host_validation": "not_performed_by_this_command" +} diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 4cec0d6..b2c0ece 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -569,7 +569,11 @@ NSView *DYCreateWorkspaceMaskEditor(id } [self themeChanged:nil]; [self setAccessibilityLabel:@"大鱼调色检查器"]; - [self setNeedsLayout:YES]; + // FxPlug snapshots the returned frame when it allocates the host row. + // 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)]; } DYBetaSpanEnd(beta,nil);return self; } @@ -944,7 +948,14 @@ NSView *DYCreateWorkspaceMaskEditor(id [self invalidateIntrinsicContentSize]; if(self.frame.size.height!=preferred) [self setFrameSize:NSMakeSize(self.frame.size.width,preferred)]; - [self.superview setNeedsLayout:YES]; + // 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]; NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); }); } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 2d46eb8..8043c9b 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.17.0 CFBundleVersion - 98 + 99 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index a4a17d3..ccc19c9 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.17.0 CFBundleVersion - 98 + 99 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright