fix: start workspace as a narrow strip and keep native row controls visible

这个提交包含在:
mac 于 2026-11-05 04:01:21 +08:00 提交
1 父节点 a0a97dfd88
当前提交 a9cf2eda29
5 个文件已更改
+340 -64

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

+7 -8
查看文件
@@ -1,17 +1,16 @@
{
"status": "verified",
"status": "installed-awaiting-host-verification",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.11.0",
"build": "73",
"version": "1.12.0",
"build": "74",
"team": "B3W25FX5H5",
"notaryID": "348c6e9b-f5d9-4661-bc7f-f192fa770ecf",
"notaryID": "0c576ab9-9c86-4bcb-a483-065833cb2953",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "49d35cb49ab93f5ab6ca3411eaea80f7219be346",
"sourceCommit": "a0a97dfd8854f01dcec54b7aebc3fdc1fed8568d",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803",
"shaderSHA256": "462afbfdfc8d79aefd17d0928151f4c981d4145e2ad6bc3486a27aa73177b128",
"hostVerification": "verification/HostCanvasTools1.11.0.json",
"hostAcceptance": "User actual mouse: 三项均正常"
"shaderSHA256": "7d05797e5e68ec8c23886c74d37a32826843c541e13a3f35424c1903e28bff56",
"previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-94ced90dbe78482dac41fc8eedc6e972.app"
}
+314 -48
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 724,
"checks": 784,
"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/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A"
},
{
"descriptors": 285,
@@ -890,7 +890,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -910,7 +910,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 62.63825000496581,
"maximumGapMS": 62.491916673025116,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -1187,17 +1187,175 @@
"name": "primary-mask-blends-cst-only-in-selected-region",
"pass": true
},
{
"name": "shared-mask-can-be-authored-before-any-module-assignment",
"pass": true
},
{
"name": "shared-mask-two-module-bindings-retain-one-author-object",
"pass": true
},
{
"name": "editing-one-shared-mask-updates-all-linked-modules",
"pass": true
},
{
"name": "shared-tracking-is-single-timeline-for-every-module",
"pass": true
},
{
"name": "shared-mask-archive-roundtrip-keeps-unique-object-and-links",
"pass": true
},
{
"name": "shared-render-snapshot-freezes-all-bindings-with-stable-private-identities",
"pass": true
},
{
"name": "shared-mask-rejects-duplicate-binding-in-one-module",
"pass": true
},
{
"name": "shared-mask-rejects-dangling-reference",
"pass": true
},
{
"name": "shared-mask-rejects-copied-author-object-with-same-identity",
"pass": true
},
{
"name": "legacy-document-cannot-silently-contain-shared-references",
"pass": true
},
{
"name": "unlinking-one-module-keeps-shared-mask-and-other-module",
"pass": true
},
{
"name": "deleting-shared-mask-removes-all-references-without-deleting-modules",
"pass": true
},
{
"name": "sharing-legacy-mask-moves-one-object-without-changing-geometry-or-identity",
"pass": true
},
{
"name": "removing-base-module-detaches-reference-and-preserves-shared-object",
"pass": true
},
{
"name": "shared-library-and-per-module-reference-limits-remain-independent",
"pass": true
},
{
"name": "shared-key-budget-counts-author-object-once-regardless-of-bindings",
"pass": true
},
{
"name": "workspace-six-mask-editors-fit-377-600-860-1200-point-widths",
"pass": true
},
{
"name": "gpu-shared-hsl-spider-use-one-rectangle-author",
"pass": true
},
{
"error": "未提供错误信息",
"name": "gpu-shared-hsl-spider-initial-render",
"pass": true,
"validSnapshot": true
},
{
"error": "未提供错误信息",
"name": "gpu-independent-hsl-spider-initial-reference",
"pass": true,
"validSnapshot": true
},
{
"changedComponents": 0,
"maxAbsoluteError": 0,
"name": "gpu-shared-hsl-spider-equals-two-independent-masks-per-pixel",
"nonfiniteComponents": 0,
"nonzeroComponents": 9832,
"pass": true
},
{
"error": "未提供错误信息",
"name": "gpu-shared-hsl-only-control",
"pass": true,
"validSnapshot": true
},
{
"error": "未提供错误信息",
"name": "gpu-shared-spider-only-control",
"pass": true,
"validSnapshot": true
},
{
"name": "gpu-shared-region-both-hsl-and-spider-affect-real-pixels",
"pass": true
},
{
"error": "未提供错误信息",
"name": "gpu-shared-edited-rectangle-render",
"pass": true,
"validSnapshot": true
},
{
"error": "未提供错误信息",
"name": "gpu-independent-edited-rectangle-reference",
"pass": true,
"validSnapshot": true
},
{
"changedComponents": 3573,
"maximumReferenceError": 0,
"name": "gpu-editing-unique-shared-geometry-updates-both-operations",
"pass": true,
"uniqueAuthorObjects": 1
},
{
"error": "未提供错误信息",
"name": "gpu-shared-tracking-middle-render",
"pass": true,
"validSnapshot": true
},
{
"error": "未提供错误信息",
"name": "gpu-independent-tracking-middle-reference",
"pass": true,
"validSnapshot": true
},
{
"changedComponents": 2279,
"evaluatedCenterX": 0.5,
"maximumReferenceError": 0,
"name": "gpu-one-shared-trajectory-drives-hsl-and-spider-per-frame",
"pass": true
},
{
"name": "preset-v7-json-roundtrip-preserves-unique-shared-object-and-trajectory",
"pass": true
},
{
"name": "workspace-remote-attaches-within-host-permissions",
"pass": true
},
{
"closePixels": 3066,
"headingPixels": 51420,
"name": "workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture",
"pass": true
},
{
"name": "workspace-scopes-page-enables-only-visible-output-capture",
"pass": true
},
{
"closePixels": 5468,
"headingPixels": 4953,
"name": "workspace-offscreen-topbar-heading-pages-close-render-pixels",
"pagesPixels": 1664,
"pagesPixels": 29437,
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/workspace-topbar.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A/workspace-topbar.png"
},
{
"name": "workspace-content-and-scope-pane-explicitly-clip",
@@ -1212,10 +1370,10 @@
"pass": true
},
{
"closePixels": 3066,
"headingPixels": 40380,
"closePixels": 5468,
"headingPixels": 4720,
"name": "workspace-topbar-survives-resize-and-large-dirty-redraw",
"pagesPixels": 1664,
"pagesPixels": 29711,
"pass": true
},
{
@@ -1260,7 +1418,7 @@
},
{
"name": "workspace-independent-style-fixture-inserted",
"node": "DB95746F-DB9E-46E2-BA89-96FD043BA21B",
"node": "C34D0ABD-BE71-4F57-9196-1562A263C4BB",
"pass": true,
"validDocument": true
},
@@ -1269,10 +1427,10 @@
"error": "none",
"name": "workspace-independent-style1-writes-target-node-inside-undo",
"nodePaths": {
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/node.cube"
"look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A/node.cube"
},
"pass": true,
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/user-new.cube",
"rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A/user-new.cube",
"undoStartsAfter": 3,
"undoStartsBefore": 2,
"written": true
@@ -1306,6 +1464,58 @@
"name": "workspace-hidden-scope-capture-does-no-work",
"pass": true
},
{
"name": "workspace-toolbar-lists-every-tool-in-one-horizontal-scroll-strip",
"pass": true
},
{
"name": "workspace-toolbar-adds-real-uuid-and-synchronizes-regular-inspector",
"pass": true
},
{
"name": "workspace-curve-xy-samples-use-one-undo-and-exact-uuid",
"pass": true
},
{
"name": "workspace-curve-gesture-rejects-a-changed-playhead",
"pass": true
},
{
"name": "workspace-curve-gesture-preserves-an-external-parameter-edit",
"pass": true
},
{
"name": "workspace-two-independent-lut-layer-fixtures-exist",
"pass": true
},
{
"name": "workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing",
"pass": true
},
{
"name": "workspace-switching-lut-target-stays-on-visible-browser-page",
"pass": true
},
{
"name": "workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets",
"pass": true
},
{
"name": "workspace-shared-mask-links-hsl-and-spider-as-one-author-object",
"pass": true
},
{
"name": "workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",
"pass": true
},
{
"name": "workspace-closed-panel-never-steals-canvas-or-module-selection",
"pass": true
},
{
"name": "workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",
"pass": true
},
{
"name": "inserted-tool-documents-have-validated-anchors",
"pass": true
@@ -2166,21 +2376,29 @@
"pass": true
},
{
"name": "tracking-captures-real-full-input-texture",
"name": "tracking-renders-valid-source-before-analysis",
"pass": true
},
{
"centerX": 0.5312501192092896,
"centerY": 0.52604079246521,
"name": "inactive-tracking-avoids-full-frame-motion-readback",
"pass": true
},
{
"centerX": 0.5312498807907104,
"centerY": 0.5260412096977234,
"error": "未提供错误信息",
"keyCount": 6,
"name": "host-callback-metal-tracking-six-exact-frames",
"name": "host-callback-opencv-tracking-six-exact-frames",
"pass": true
},
{
"name": "tracking-results-use-one-undo-action",
"pass": true
},
{
"name": "completed-tracking-releases-4k-gpu-analysis-working-images",
"pass": true
},
{
"name": "duplicate-analysis-cleanup-never-commits-twice",
"pass": true
@@ -2249,18 +2467,30 @@
"pass": true
},
{
"height": 720,
"maximumError": 4.9269199371315686e-05,
"name": "tracking-4k-frame-lowpass-before-normalized-motion-grid",
"height": 2160,
"maximumError": 7.175931748815145e-08,
"name": "tracking-4k-frame-preserves-full-detail-for-opencv",
"pass": true,
"width": 1280
"width": 3840
},
{
"name": "shared-tracking-same-mask-switches-global-hsl-spider-without-interruption",
"pass": true
},
{
"name": "shared-tracking-survives-removing-original-module-and-commits-one-object",
"pass": true
},
{
"name": "shared-mask-inspector-alias-activates-canvas-and-receives-canonical-status",
"pass": true
},
{
"name": "canvas-cold-load-selects-saved-mask-from-immutable-snapshot",
"pass": true
},
{
"coveredPixels": 24613,
"coveredPixels": 6080,
"name": "native-osc-real-metal-overlay-transparent-around-controls",
"pass": true
},
@@ -2287,7 +2517,43 @@
"pass": true
},
{
"name": "native-osc-mask-toolbar-stays-inside-small-letterboxed-image",
"name": "native-osc-removes-all-nine-background-mask-toolbar-buttons",
"pass": true
},
{
"name": "native-osc-keeps-only-two-pen-actions-bounded-at-bottom",
"pass": true
},
{
"name": "native-osc-new-shape-can-start-anywhere-and-hides-default-box",
"pass": true
},
{
"name": "native-osc-shape-drag-updates-local-bbox-without-author-or-undo-write",
"pass": true
},
{
"name": "native-osc-shape-release-commits-final-bbox-once-to-all-shared-modules",
"pass": true
},
{
"name": "native-osc-shape-escape-keeps-author-and-all-shared-bindings",
"pass": true
},
{
"name": "native-osc-shape-click-without-area-does-not-write-or-create-undo",
"pass": true
},
{
"name": "native-osc-shape-playhead-change-cancels-before-write",
"pass": true
},
{
"name": "native-osc-queued-shape-commit-rechecks-host-playhead",
"pass": true
},
{
"name": "native-osc-ellipse-draws-reverse-direction-with-positive-shared-extents",
"pass": true
},
{
@@ -3442,39 +3708,35 @@
"pass": true
},
{
"name": "viewer-vertical-rail-exposes-all-tools-without-a-parameter-panel",
"name": "viewer-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",
"pass": true
},
{
"name": "viewer-tools-open-independent-panels-without-editing-the-grade",
"name": "viewer-control-panel-entry-is-labelled-and-anchored-at-bottom",
"pass": true
},
{
"name": "viewer-dragging-header-moves-panel-with-final-release-point-and-no-undo",
"name": "viewer-lut-entry-opens-browser-page-without-canvas-parameter-card",
"pass": true
},
{
"name": "viewer-label-and-knob-deadzone-do-not-create-edits",
"name": "viewer-bottom-control-panel-opens-tools-workspace",
"pass": true
},
{
"name": "viewer-slider-preserves-grab-offset-and-updates-live",
"name": "viewer-persistent-mask-entries-route-shapes-to-shared-workspace",
"pass": true
},
{
"name": "viewer-slider-captures-outside-and-closes-one-undo",
"name": "viewer-skin-entry-toggles-actual-protection-preview-without-parameter-card",
"pass": true
},
{
"name": "viewer-base-tone-and-color-eyes-remain-independent",
"name": "viewer-skin-preview-toggle-restores-review-image",
"pass": true
},
{
"name": "viewer-empty-removed-tool-never-terminates-another-panels-live-gesture",
"pass": true
},
{
"name": "viewer-curve-opens-an-editable-graph-beside-existing-panel",
"name": "viewer-curve-is-graph-only-without-title-catalog-or-parameter-page",
"pass": true
},
{
@@ -3494,23 +3756,31 @@
"pass": true
},
{
"name": "viewer-grading-wheel-edits-hue-and-saturation-in-one-gesture",
"name": "viewer-lens-is-transparent-grid-and-direct-handles-without-parameter-card",
"pass": true
},
{
"name": "viewer-graph-panel-retains-precise-parameter-view",
"name": "viewer-lens-center-drags-both-normalized-axes-in-one-undo",
"pass": true
},
{
"name": "viewer-graph-mode-and-page-buttons-never-overlap",
"name": "viewer-lens-strength-handle-writes-existing-radial-parameter",
"pass": true
},
{
"name": "viewer-closing-one-panel-preserves-other-graph-and-controls",
"name": "viewer-repeated-image-tool-entry-closes-only-that-overlay",
"pass": true
},
{
"name": "viewer-floating-editor-layer-menu-selects-only-its-tool-type",
"name": "viewer-curve-follows-workspace-selected-uuid-of-the-same-type",
"pass": true
},
{
"name": "viewer-selected-curve-uuid-writes-own-points-and-preserves-base",
"pass": true
},
{
"name": "viewer-second-same-type-uuid-does-not-overwrite-first-or-base",
"pass": true
},
{
@@ -3533,18 +3803,14 @@
"name": "viewer-small-and-retina-canvases-never-hit-outside-visible-image",
"pass": true
},
{
"name": "viewer-vertical-entry-remains-reachable-above-overlapping-small-panel",
"pass": true
},
{
"name": "viewer-rail-is-anchored-to-image-and-not-letterbox",
"pass": true
},
{
"name": "viewer-real-osc-draws-curves-hsl-and-spider-offscreen",
"name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C/viewer-workspace.png"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A/viewer-workspace.png"
},
{
"name": "canvas-hsl-plot-captures-outside-and-commits-one-undo",
@@ -3685,6 +3951,6 @@
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/148FEAE4-C0CE-4B1C-89E2-6F0DDC4DBD8C",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/959E9FBB-C58F-4300-8E18-513907ED899A",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+10 -5
查看文件
@@ -81,12 +81,12 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane;
DYScopePlot *_plot;
NSTextField *_heading,*_description,*_status,*_lutExplanation;
NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes;
NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes,*_sizeMode;
DYWorkspaceLifetime *_lifetime;
NSProgress *_selectionTask;
NSView *_remoteParent;NSWindow *_presentationWindow;
NSString *_title,*_lastError;
BOOL _visible,_opening,_closed,_closing;
BOOL _visible,_opening,_closed,_closing,_expanded;
NSUInteger _session,_selectionID;
NSView *_toolPane,*_editorHost,*_toolbar,*_maskPane;NSScrollView *_toolbarScroll,*_layerScroll,*_maskScroll,*_assignmentScroll;
NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView<DYWorkspaceMaskEditing> *_maskEditor;
@@ -104,6 +104,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
_heading=[[DYThemeLabel labelWithString:@""]retain];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading];
_pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=4;for(NSInteger i=0;i<4;i++)[_pages setLabel:@[@"调整",@"蒙版",@"LUT",@"示波器"][i]forSegment:i];_pages.selectedSegment=0;_pages.target=self;_pages.action=@selector(pageChanged:);_pages.accessibilityLabel=@"控制面板页面";[_root addSubview:_pages];
_close=[[DYThemeButton alloc]init];_close.title=@"关闭";_close.target=self;_close.action=@selector(closePressed:);_close.bezelStyle=NSBezelStyleRounded;[_root addSubview:_close];
_sizeMode=[DYWorkspaceButton(@"",self,@selector(toggleWorkspaceSize:))retain];_sizeMode.imagePosition=NSImageOnly;[_root addSubview:_sizeMode];
_scopePane=[[DYWorkspaceRoot alloc]init];_scopePane.clipsToBounds=YES;[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES;
_scopeMode=[[DYThemePopUpButton alloc]init];[_scopeMode addItemsWithTitles:@[@"亮度波形",@"RGB 分列",@"直方图"]];_scopeMode.target=self;_scopeMode.action=@selector(scopeModeChanged:);_scopeMode.accessibilityLabel=@"示波器类型";[_scopePane addSubview:_scopeMode];
_hostScopes=[[DYThemeButton alloc]init];_hostScopes.title=@"FCP 示波器";_hostScopes.bezelStyle=NSBezelStyleRounded;_hostScopes.target=self;_hostScopes.action=@selector(toggleHostScopes:);_hostScopes.toolTip=@"打开或关闭 Final Cut Pro 自带的视频示波器;下方是大鱼的显示参考示波器";[_scopePane addSubview:_hostScopes];
@@ -120,7 +121,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
- (void)dealloc{
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_title release];[_lastError release];[_lifetime release];
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
}
- (BOOL)visible{return _visible||_opening;}
@@ -141,7 +142,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
void(^reply)(FxXPView *,NSError *)=^(FxXPView *parent,NSError *error){void(^attach)(void)=^{DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session)return;owner->_opening=NO;
if(!parent){[owner reportError:error.localizedDescription?:@"宿主未能创建辅助窗口"];return;}[owner attachToParent:parent];
};if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);};
if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(720,300) maximumSize:NSMakeSize(2400,1200) reply:reply];
// FCP initially uses the requested maximum. Keep the default a narrow strip;
// larger LUT/mask layouts are an explicit choice, without moving host windows.
if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(720,300) maximumSize:_expanded?NSMakeSize(2400,1200):NSMakeSize(1440,360) reply:reply];
else if(remote)[remote remoteWindowOfSize:NSMakeSize(1120,360) reply:reply];
else{_opening=NO;[self reportError:@"当前宿主未提供外部工具窗口接口"];}
}@finally{[action endAction:self];}
@@ -163,7 +166,8 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
}
- (void)layoutWorkspace{
CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height;
_heading.frame=NSMakeRect(12,9,MAX(100,w-430),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-398),7,306,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27);
_heading.frame=NSMakeRect(12,9,MAX(100,w-466),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-434),7,306,27);_sizeMode.frame=NSMakeRect(MAX(0,w-120),7,28,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27);
_sizeMode.image=[NSImage imageWithSystemSymbolName:_expanded?@"arrow.down.right.and.arrow.up.left":@"arrow.up.left.and.arrow.down.right" accessibilityDescription:_expanded?@"收为窄条":@"扩大工作区"];_sizeMode.accessibilityLabel=_expanded?@"收为窄条":@"扩大工作区";_sizeMode.toolTip=_sizeMode.accessibilityLabel;_sizeMode.contentTintColor=DYThemeColor(@"text");
_toolbarScroll.frame=NSMakeRect(8,39,MAX(1,w-16),40);
_sizingSplit=YES;_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));_sizingSplit=NO;[self layoutToolWorkspace];
_scopePane.frame=_editorHost.bounds;_lutPane.frame=NSMakeRect(0,25,_editorHost.bounds.size.width,MAX(1,_editorHost.bounds.size.height-25));_lutExplanation.frame=NSMakeRect(8,2,MAX(1,_editorHost.bounds.size.width-16),22);
@@ -245,6 +249,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
else if(error)*error=[NSError errorWithDomain:@"com.dayu.color.workspace" code:1 userInfo:@{NSLocalizedDescriptionKey:failure?:@"LUT 操作未完成"}];return written;
}
- (void)closePressed:(id)sender{[self close];}
- (void)toggleWorkspaceSize:(id)sender{BOOL expanded=!_expanded;[self close];_expanded=expanded;[self showRelativeToView:nil];}
- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;}
- (void)close{
if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO];
@@ -10,6 +10,7 @@
run.record(@"workspace-remote-attaches-within-host-permissions",workspace.visible&&host->_requests==1&&!host->_permissionFailure&&root.superview==host->_parent&&!fixture.visible);
NSView *scopePane=[workspace valueForKey:@"scopePane"],*heading=[workspace valueForKey:@"heading"],*pages=[workspace valueForKey:@"pages"],*closeButton=nil;for(NSView *control in root.subviews)if([control isKindOfClass:NSButton.class]&&[[(NSButton*)control title]isEqual:@"关闭"])closeButton=control;
run.record(@"workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture",[(NSSegmentedControl*)pages segmentCount]==4&&[(NSSegmentedControl*)pages selectedSegment]==0&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&host->_minimumRequested.height<=300);
run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==720&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360);
[workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scopes-page-enables-only-visible-output-capture",[(NSSegmentedControl*)pages selectedSegment]==3&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]);
NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading),pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
NSString *headerPNG=[runtime stringByAppendingPathComponent:@"workspace-topbar.png"];BOOL headerSaved=[[headerBitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:headerPNG atomically:YES];
@@ -86,6 +87,9 @@
[curveEditor graphicGesture:YES title:@"测试外部改值"];[stackHost startAction:stack];NSMutableDictionary *externalCurve=DYMutablePlist(DYReadTools(stackHost,kCMTimeZero).document);((NSMutableDictionary*)DYToolWithID(externalCurve,curveID))[@"values"][@"curveY0"]=@22;DYWriteTools(stackHost,externalCurve,kCMTimeZero);[stackHost endAction:stack];[curveEditor writeGraphicValues:@{@"curveY0":@44}];[curveEditor graphicGesture:NO title:nil];
run.record(@"workspace-curve-gesture-preserves-an-external-parameter-edit",[DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]==22);
NSView *workspaceRoot=[stack valueForKey:@"root"];[workspaceRoot layoutSubtreeIfNeeded];NSBitmapImageRep *workspaceImage=[workspaceRoot bitmapImageRepForCachingDisplayInRect:workspaceRoot.bounds];[workspaceRoot cacheDisplayInRect:workspaceRoot.bounds toBitmapImageRep:workspaceImage];[[workspaceImage representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:@"workspace-adjustments.png"]atomically:YES];
[stackHost->_parent setFrameSize:NSMakeSize(720,300)];[workspaceRoot layoutSubtreeIfNeeded];[table layoutSubtreeIfNeeded];BOOL eyesInside=YES;NSUInteger eyes=0;
for(NSInteger row=0;row<table.numberOfRows;row++){NSTableCellView *cell=[table viewAtColumn:0 row:row makeIfNecessary:YES];[cell layoutSubtreeIfNeeded];for(NSView *view in cell.subviews)if([view isKindOfClass:NSButton.class]){NSRect frame=[table convertRect:view.bounds fromView:view];eyesInside&=NSContainsRect(table.visibleRect,frame)&&NSContainsRect(cell.bounds,view.frame);eyes++;}}
run.record(@"workspace-native-row-bypass-buttons-remain-visible-at-minimum-width",eyesInside&&eyes==table.numberOfRows,@{@"buttons":@(eyes),@"rows":@(table.numberOfRows)});[stackHost->_parent setFrameSize:NSMakeSize(1120,360)];[workspaceRoot layoutSubtreeIfNeeded];
[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookA=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookB=[[[stack valueForKey:@"selectedNode"]copy]autorelease];
run.need(@"workspace-two-independent-lut-layer-fixtures-exist",lookA&&lookB&&![lookA isEqual:lookB]&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookA)&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookB));
NSString *pathA=[runtime stringByAppendingPathComponent:@"workspace-A.cube"],*pathB=[runtime stringByAppendingPathComponent:@"workspace-B.cube"],*late=[runtime stringByAppendingPathComponent:@"workspace-late.cube"];NSDictionary *basePaths=[[DYReadAssets(stackHost,kCMTimeZero).paths copy]autorelease];NSError *failure=nil;
@@ -107,4 +111,5 @@
run.record(@"workspace-closed-panel-never-steals-canvas-or-module-selection",oldMask&&canvasSelections==1&&toolSelections==0&&!stack.visible);
[NSNotificationCenter.defaultCenter removeObserver:canvasObserver];[NSNotificationCenter.defaultCenter removeObserver:toolObserver];
run.record(@"workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",stackHost->_writesInAction&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0&&stackHost->_undoStarts==stackHost->_undoEnds&&!fixture.visible);
[stack showRelativeToView:nil];workspaceDrain();NSString *selectedBefore=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack toggleWorkspaceSize:nil];workspaceDrain();BOOL expanded=stack.visible&&stackHost->_maximumRequested.height==1200&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore];[stack toggleWorkspaceSize:nil];workspaceDrain();run.record(@"workspace-size-mode-keeps-selection-and-recreates-only-host-window",expanded&&stack.visible&&stackHost->_maximumRequested.height==360&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore]&&!stackHost->_permissionFailure);[stack close];
}
+4 -3
查看文件
@@ -9,7 +9,7 @@
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=YES;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
_layerTable=[[NSTableView alloc]init];NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
_layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
_addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask];
_deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer];
_selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle];
@@ -71,8 +71,9 @@
}
- (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;}
- (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row {
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label;
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell;
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.lineBreakMode=NSLineBreakByTruncatingTail;label.translatesAutoresizingMaskIntoConstraints=NO;[cell addSubview:label];cell.textField=label;
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.translatesAutoresizingMaskIntoConstraints=NO;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];
[NSLayoutConstraint activateConstraints:@[[eye.trailingAnchor constraintEqualToAnchor:cell.trailingAnchor constant:-6],[eye.centerYAnchor constraintEqualToAnchor:cell.centerYAnchor],[eye.widthAnchor constraintEqualToConstant:26],[eye.heightAnchor constraintEqualToConstant:26],[label.leadingAnchor constraintEqualToAnchor:cell.leadingAnchor constant:8],[label.trailingAnchor constraintEqualToAnchor:eye.leadingAnchor constant:-4],[label.centerYAnchor constraintEqualToAnchor:cell.centerYAnchor],[label.heightAnchor constraintEqualToConstant:20]]];return cell;
}
- (void)tableViewSelectionDidChange:(NSNotification*)note {
if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil];