From b216cebc705fdc3d58454c248af83f24c0c802ab Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 4 Nov 2026 22:10:25 +0800 Subject: [PATCH] fix: clip remote workspace backgrounds so page controls remain visible; build72 --- verification/Delivery.json | 14 +- verification/InstalledSelfTest.json | 221 +++++++++++++++--- verification/Viewer71Candidate.json | 17 ++ 大鱼调色/Plugin/DYColorWorkspace.mm | 5 +- .../Plugin/DYWorkspaceDiagnosticHost.inc.h | 22 ++ 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 9 + 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 8 files changed, 253 insertions(+), 39 deletions(-) create mode 100644 verification/Viewer71Candidate.json diff --git a/verification/Delivery.json b/verification/Delivery.json index d2ccd56..d20677a 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -1,16 +1,16 @@ { - "status": "verified", + "status": "installed-awaiting-host-verification", "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", - "version": "1.9.0", - "build": "70", + "version": "1.10.0", + "build": "71", "team": "B3W25FX5H5", - "notaryID": "725eb423-bc88-407b-ba23-ce9e0c9f5666", + "notaryID": "5a78e3ed-2729-40ee-8962-f4c18a1c8e83", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "30d413dc423a739f0c00fede41ffde39f3e11cf0", + "sourceCommit": "5cf4ba75b3b39dafebcfb5178a97e61d9005b878", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891", - "shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76", - "hostVerification": "verification/HostViewerControls1.9.0.json" + "shaderSHA256": "bedde862e59d92dc2b0af19eba39ae35f77400a8553973b9180637f73dbb92e3", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-f5faa3ad9588406299fbc75187b487ba.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index a775a84..46a0346 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": 653, + "checks": 691, "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/24C5C846-23E9-4A31-9AD9-23D97C252D8F" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5" }, { "descriptors": 278, @@ -890,7 +890,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/24C5C846-23E9-4A31-9AD9-23D97C252D8F/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5/diagnostic-export.cube" }, { "bytes": 1186074, @@ -910,7 +910,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 81.18300000205636, + "maximumGapMS": 74.43850001436658, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1187,6 +1187,102 @@ "name": "primary-mask-blends-cst-only-in-selected-region", "pass": true }, + { + "name": "workspace-remote-attaches-within-host-permissions", + "pass": true + }, + { + "name": "workspace-follows-remote-container-resize", + "pass": true + }, + { + "name": "workspace-reopens-existing-host-remote-window", + "pass": true + }, + { + "name": "workspace-closes-host-window-once-and-stops-scopes", + "pass": true + }, + { + "name": "workspace-host-close-cleans-without-recursive-close", + "pass": true + }, + { + "name": "workspace-new-scope-session-clears-old-frame", + "pass": true + }, + { + "name": "workspace-style1-preserves-other-lut-slots-one-undo", + "pass": true + }, + { + "name": "workspace-remove-style1-applies-once-after-async-boundary", + "pass": true + }, + { + "name": "workspace-async-playhead-change-keeps-new-frame-untouched", + "pass": true + }, + { + "name": "workspace-async-lut-conflict-preserves-user-change", + "pass": true + }, + { + "name": "workspace-async-color-context-conflict-preserves-state", + "pass": true + }, + { + "name": "workspace-close-cancels-pending-selection-without-write", + "pass": true + }, + { + "name": "workspace-independent-style-fixture-inserted", + "node": "9B9E3D49-7DBC-49B0-A367-3AE014D39B81", + "pass": true, + "validDocument": true + }, + { + "commitWithinUndo": true, + "error": "none", + "name": "workspace-independent-style1-writes-target-node-inside-undo", + "nodePaths": { + "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5/node.cube" + }, + "pass": true, + "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5/user-new.cube", + "undoStartsAfter": 3, + "undoStartsBefore": 2, + "written": true + }, + { + "name": "workspace-relative-lut-path-is-rejected-before-undo", + "pass": true + }, + { + "error": "宿主未保存此风格图层的 LUT,原来的选择已保留;请重试", + "name": "workspace-node-host-rejection-is-not-reported-as-applied", + "pass": true + }, + { + "name": "workspace-deleted-node-does-not-write-another-layer", + "pass": true + }, + { + "name": "workspace-offscreen-fixtures-never-presented", + "pass": true + }, + { + "name": "workspace-final-output-sample-unpremultiplies-and-converts-real-icc", + "pass": true + }, + { + "name": "workspace-final-output-worker-publishes-real-scope-rasters", + "pass": true + }, + { + "name": "workspace-hidden-scope-capture-does-no-work", + "pass": true + }, { "name": "inserted-tool-documents-have-validated-anchors", "pass": true @@ -2141,7 +2237,7 @@ "pass": true }, { - "coveredPixels": 22088, + "coveredPixels": 24076, "name": "native-osc-real-metal-overlay-transparent-around-controls", "pass": true }, @@ -2167,6 +2263,10 @@ "name": "native-osc-mask-gesture-keeps-capture-when-crossing-the-open-viewer-panel", "pass": true }, + { + "name": "native-osc-mask-toolbar-stays-inside-small-letterboxed-image", + "pass": true + }, { "name": "inspector-add-pen-enters-empty-drawing-mode", "pass": true @@ -3271,94 +3371,159 @@ "pass": true }, { - "name": "viewer-controls-start-collapsed-without-hidden-slider-hit", + "name": "viewer-bridge-batch-begin-only-reads-and-preserves-unused-curve-slot", "pass": true }, { - "name": "viewer-controls-collapsed-header-drag-moves-position-without-expanding", + "name": "viewer-bridge-curve-xy-are-live-in-one-host-action-before-mouse-up", "pass": true }, { - "name": "viewer-controls-expand-is-separate-from-effect-enabling", + "name": "viewer-bridge-batch-continuous-xy-drag-uses-one-undo", "pass": true }, { - "name": "viewer-controls-show-all-fourteen-existing-tools-directly", + "name": "viewer-bridge-incomplete-nonfinite-and-foreign-key-samples-reject-the-entire-batch", "pass": true }, { - "name": "viewer-controls-direct-tool-switches-never-write-grading-parameters", + "name": "viewer-bridge-batch-no-op-does-not-create-an-undo", "pass": true }, { - "name": "viewer-controls-expanded-header-drag-moves-all-tool-and-parameter-hit-regions-together", + "name": "viewer-bridge-external-y-edit-stops-both-axes-of-the-graphic-gesture", "pass": true }, { - "name": "viewer-controls-playhead-interruption-clears-all-panel-drag-state", + "name": "viewer-bridge-one-stale-original-value-rejects-the-entire-graphic-gesture", "pass": true }, { - "name": "viewer-controls-ordinary-button-release-outside-still-cancels-action", + "name": "viewer-bridge-mixed-module-batch-is-rejected-before-any-write", "pass": true }, { - "name": "viewer-controls-tone-eye-does-not-misrepresent-the-separate-color-eye", + "name": "viewer-bridge-independent-curve-xy-commit-together-with-root-isolation", "pass": true }, { - "name": "viewer-controls-clicking-a-label-does-not-change-the-grade", + "name": "viewer-bridge-single-value-entry-points-remain-compatible-after-batch-extension", "pass": true }, { - "name": "viewer-controls-slider-deadzone-does-not-create-an-edit", + "name": "viewer-bridge-rejected-second-field-restores-first-field-within-the-same-action", "pass": true }, { - "name": "viewer-controls-knob-grab-preserves-offset-and-writes-live", + "name": "viewer-bridge-external-cst-configuration-conflict-stops-the-whole-color-wheel", "pass": true }, { - "name": "viewer-controls-drag-remains-captured-outside-the-panel-and-clamps", + "name": "viewer-vertical-rail-exposes-fourteen-tools-without-a-parameter-panel", "pass": true }, { - "name": "viewer-controls-mouse-up-applies-final-position-and-closes-one-undo", + "name": "viewer-tools-open-independent-panels-without-editing-the-grade", "pass": true }, { - "name": "viewer-controls-explicit-reset-uses-existing-parameter-default", + "name": "viewer-dragging-header-moves-panel-with-final-release-point-and-no-undo", "pass": true }, { - "name": "viewer-controls-hidden-parameter-subtree-has-no-hit-areas", + "name": "viewer-label-and-knob-deadzone-do-not-create-edits", "pass": true }, { - "name": "viewer-controls-module-selection-does-not-write-grade-or-undo", + "name": "viewer-slider-preserves-grab-offset-and-updates-live", "pass": true }, { - "name": "viewer-controls-module-button-retains-identity-when-a-layer-is-deleted-during-press", + "name": "viewer-slider-captures-outside-and-closes-one-undo", "pass": true }, { - "name": "viewer-controls-hover-and-exit-request-redraw-only-when-state-changes", + "name": "viewer-base-tone-and-color-eyes-remain-independent", "pass": true }, { - "name": "viewer-controls-collapse-hides-the-entire-interactive-subtree", + "name": "viewer-empty-removed-tool-never-terminates-another-panels-live-gesture", "pass": true }, { - "name": "viewer-controls-small-and-retina-canvases-never-hit-outside-visible-bounds", + "name": "viewer-curve-opens-an-editable-graph-beside-existing-panel", "pass": true }, { - "name": "viewer-controls-entry-is-anchored-inside-the-host-image-not-letterbox", + "name": "viewer-curve-point-is-live-xy-not-a-scalar-only-control", "pass": true + }, + { + "name": "viewer-curve-final-release-commits-both-axes-with-one-undo", + "pass": true + }, + { + "name": "viewer-curve-delete-deactivates-the-selected-slot", + "pass": true + }, + { + "name": "viewer-curve-channel-switch-is-view-state-with-no-undo", + "pass": true + }, + { + "name": "viewer-grading-wheel-edits-hue-and-saturation-in-one-gesture", + "pass": true + }, + { + "name": "viewer-graph-panel-retains-precise-parameter-view", + "pass": true + }, + { + "name": "viewer-graph-mode-and-page-buttons-never-overlap", + "pass": true + }, + { + "name": "viewer-closing-one-panel-preserves-other-graph-and-controls", + "pass": true + }, + { + "name": "viewer-floating-editor-layer-menu-selects-only-its-tool-type", + "pass": true + }, + { + "name": "viewer-playhead-change-clears-graphic-capture", + "pass": true + }, + { + "name": "viewer-missing-next-frame-snapshot-preserves-selected-independent-layer", + "pass": true + }, + { + "name": "viewer-new-frame-restores-the-same-independent-editor-target", + "pass": true + }, + { + "name": "viewer-deleted-layer-falls-back-to-surviving-same-tool", + "pass": true + }, + { + "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-vertical-rail-curves-and-wheels-offscreen", + "pass": true, + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5/viewer-workspace.png" } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/24C5C846-23E9-4A31-9AD9-23D97C252D8F", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/114D06BD-6F6F-4CB9-B278-D0AABD7D60C5", "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/Viewer71Candidate.json b/verification/Viewer71Candidate.json new file mode 100644 index 0000000..0c069ea --- /dev/null +++ b/verification/Viewer71Candidate.json @@ -0,0 +1,17 @@ +{ + "status": "notarized-installed-candidate-superseded-before-release", + "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "bundleID": "com.dayu.color", + "version": "1.10.0", + "build": "71", + "team": "B3W25FX5H5", + "notaryID": "5a78e3ed-2729-40ee-8962-f4c18a1c8e83", + "notaryStatus": "Accepted", + "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", + "sourceCommit": "5cf4ba75b3b39dafebcfb5178a97e61d9005b878", + "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", + "templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891", + "shaderSHA256": "bedde862e59d92dc2b0af19eba39ae35f77400a8553973b9180637f73dbb92e3", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-f5faa3ad9588406299fbc75187b487ba.app", + "hostIssue": "FCP remote workspace scope body painted above header; title/page switch/close controls obscured. Native 691 checks passed but did not detect sibling overdraw. Root view clipping fix required; build72 will supersede." +} diff --git a/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index fe552d5..ef2ac4a 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -20,9 +20,10 @@ @property(nonatomic,assign) DYColorWorkspace *owner; @end @implementation DYWorkspaceRoot +- (instancetype)initWithFrame:(NSRect)frame{if((self=[super initWithFrame:frame]))self.clipsToBounds=YES;return self;} - (BOOL)isFlipped{return YES;} - (BOOL)isOpaque{return YES;} -- (void)drawRect:(NSRect)dirty{[DYThemeColor(@"background")setFill];NSRectFill(dirty);} +- (void)drawRect:(NSRect)dirty{[DYThemeColor(@"background")setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));} - (void)resizeSubviewsWithOldSize:(NSSize)old{[super resizeSubviewsWithOldSize:old];[_owner layoutWorkspace];} @end @interface DYScopePlot:NSView @@ -87,7 +88,7 @@ _heading=[[DYThemeLabel alloc]init];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading]; _pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=2;[_pages setLabel:@"示波器" forSegment:0];[_pages setLabel:@"风格1 LUT" forSegment:1];_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]; - _scopePane=[[DYWorkspaceRoot alloc]init];[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES; + _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]; _description=[[DYThemeLabel alloc]init];_description.font=[NSFont systemFontOfSize:11];[_scopePane addSubview:_description]; diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h index f00f348..df2bfb1 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnosticHost.inc.h @@ -29,3 +29,25 @@ - (NSProgress *)prepareLUTPath:(NSString *)path completion:(void(^)(NSError*))completion{[_preparedTask release];_preparedTask=[[NSProgress discreteProgressWithTotalUnitCount:1]retain];[_preparedReply release];_preparedReply=[completion copy];return _preparedTask;} - (void)completePreparation{void(^reply)(NSError*)=[_preparedReply copy];[_preparedReply release];_preparedReply=nil;if(reply)reply(nil);[reply release];} @end + +// Cache only the top content strip. A background-painted sibling must never +// erase the heading/page selector/close button in that strip. +static NSBitmapImageRep *DYWorkspaceHeaderBitmap(NSView *root){ + NSRect top=NSMakeRect(0,0,root.bounds.size.width,52);NSBitmapImageRep *bitmap=[root bitmapImageRepForCachingDisplayInRect:top];if(bitmap)[root cacheDisplayInRect:top toBitmapImageRep:bitmap];return bitmap; +} +static NSUInteger DYWorkspaceHeaderInk(NSBitmapImageRep *bitmap,NSView *root,NSView *control){ + if(!bitmap||!bitmap.pixelsWide||!bitmap.pixelsHigh)return 0;NSColor *base=[[bitmap colorAtX:0 y:0]colorUsingColorSpace:NSColorSpace.deviceRGBColorSpace];if(!base)return 0; + CGFloat scale=bitmap.pixelsWide/root.bounds.size.width;NSInteger left=MAX(0,NSInteger(floor(NSMinX(control.frame)*scale))),right=MIN(bitmap.pixelsWide,NSInteger(ceil(NSMaxX(control.frame)*scale)));NSUInteger count=0; + for(NSInteger y=0;y.12))count++;} + return count; +} +static BOOL DYWorkspaceLargeDirtyPreservesHeader(NSBitmapImageRep *bitmap,NSView *root,NSView *pane){ + if(!bitmap)return NO;NSData *before=[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh]; + [NSGraphicsContext saveGraphicsState];NSGraphicsContext *context=[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap];[NSGraphicsContext setCurrentContext:context];CGContextRef cg=context.CGContext; + // Map the pane's flipped local coordinates into the cached top-strip pixels. + // Intentionally bypass AppKit's clipping here: the draw implementation must + // itself stay within its bounds even for a deliberately oversized dirty rect. + CGContextTranslateCTM(cg,0,bitmap.pixelsHigh);CGContextScaleCTM(cg,bitmap.pixelsWide/root.bounds.size.width,-bitmap.pixelsHigh/52.0);CGContextTranslateCTM(cg,pane.frame.origin.x,pane.frame.origin.y); + [pane drawRect:NSInsetRect(pane.bounds,-200,-200)];[NSGraphicsContext restoreGraphicsState]; + NSData *after=[NSData dataWithBytes:bitmap.bitmapData length:bitmap.bytesPerRow*bitmap.pixelsHigh];return [before isEqual:after]; +} diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 3e6953f..bb9e1e6 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -8,7 +8,16 @@ DYColorWorkspace *workspace=[[[DYColorWorkspace alloc]initWithManager:host renderer:scopeRenderer library:scopeLibrary title:@"原片段"]autorelease]; [workspace showRelativeToView:nil];workspaceDrain();NSView *root=[workspace valueForKey:@"root"]; 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=[workspace valueForKey:@"close"]; + 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]; + run.record(@"workspace-offscreen-topbar-heading-pages-close-render-pixels",headerSaved&&headingInk>20&&pagesInk>50&&closeInk>20,@{@"headingPixels":@(headingInk),@"pagesPixels":@(pagesInk),@"closePixels":@(closeInk),@"path":headerPNG}); + run.record(@"workspace-content-and-scope-pane-explicitly-clip",root.clipsToBounds&&scopePane.clipsToBounds); + run.record(@"workspace-oversized-scope-dirty-cannot-erase-topbar",DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane)); [host->_parent setFrameSize:NSMakeSize(800,540)];run.record(@"workspace-follows-remote-container-resize",NSEqualRects(root.frame,host->_parent.bounds)); + headerBitmap=DYWorkspaceHeaderBitmap(root);headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading);pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages);closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); + run.record(@"workspace-topbar-survives-resize-and-large-dirty-redraw",headingInk>20&&pagesInk>50&&closeInk>20&&DYWorkspaceLargeDirtyPreservesHeader(headerBitmap,root,scopePane),@{@"headingPixels":@(headingInk),@"pagesPixels":@(pagesInk),@"closePixels":@(closeInk)}); + [workspace showRelativeToView:nil];workspaceDrain();run.record(@"workspace-reopens-existing-host-remote-window",host->_requests==2&&workspace.visible&&root.superview==host->_parent); [workspace close];[workspace close];run.record(@"workspace-closes-host-window-once-and-stops-scopes",host->_closes==1&&!workspace.visible&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&!host->_permissionFailure&&host->_actionDepth==0); [workspace showRelativeToView:nil];workspaceDrain();[NSNotificationCenter.defaultCenter postNotificationName:NSWindowWillCloseNotification object:fixture];run.record(@"workspace-host-close-cleans-without-recursive-close",!workspace.visible&&host->_closes==1&&!root.superview); diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index bfd4f7d..91ac436 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.10.0 CFBundleVersion - 71 + 72 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 52ad3d2..0a4ee6b 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.10.0 CFBundleVersion - 71 + 72 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright