diff --git a/Packaging/Release-1.12.0.md b/Packaging/Release-1.12.0.md index eecdd96..26ddbd8 100644 --- a/Packaging/Release-1.12.0.md +++ b/Packaging/Release-1.12.0.md @@ -1,4 +1,4 @@ -# 大鱼调色 1.12.0(75) +# 大鱼调色 1.12.0(76) 统一调色工作区加入横排工具、左侧图层和右侧选中模块编辑。普通检查器和工作区同步新增、删除、启停、参数与蒙版。工作区采用平面深灰和紧凑图标工具条,默认横向窄条;中央直接显示当前模块,右侧常驻亮度波形、RGB分列、直方图和矢量图。分栏与窗口大小可调。 diff --git a/research/UnifiedWorkspace-20261105.md b/research/UnifiedWorkspace-20261105.md index 3c32930..d8b8dbf 100644 --- a/research/UnifiedWorkspace-20261105.md +++ b/research/UnifiedWorkspace-20261105.md @@ -62,3 +62,9 @@ OpenCV4.5.1由官方锁定源码静态构建并随包保留全部许可,宿主 四宫格第四项采用显示参考 RGB 的 BT.709 色差坐标,计算来源为 [ITU-R BT.709-6 第 3.3 节](https://www.itu.int/dms_pubrec/itu-r/rec/bt/r-rec-bt.709-6-201506-i%21%21pdf-e.pdf)。保持现有显示参考采样边界,不把它标为精密 HDR/IRE 测量。 用户已确认空白出现在切换片段或重新打开检视器后,已正常退出FCP。XPC单目标构建和812项原生离屏检查已通过,PluginKit维持唯一正式路径。正式75候选将包含后台远程回调与会话过期检查,再执行签名后完整原生自检与宿主重复切换;保留SDK reply返回前同步接入子视图的已验证尺寸合同,不以无现场证据的异步替换破坏旧几何修复。 + +### 正式75宿主实测与76修正 + +75(编译0ef847f、公证6a271e18-727a-45b6-972d-fcf2d2155d36)正式安装813项检查通过。FCP冷启动后主检视器成功加载;实测添加曲线2、方形四通道曲线与直方图、左盘右参数的蜘蛛盘、真实四宫格采样;同一矩形关联曲线2/蜘蛛盘/HSL,主检视器同步显示各自蒙版数量;添加风格LUT2直接显示现有58项库,真实缩略图与tlfs载入成功,四宫格持续显示。 + +实窗发现默认蒙版编辑区内跟踪按钮右半部分需要横滚,且蒙版数字框替换cell后未显式启用editable,AX表现为静态文字。76把标量列收窄到184点、缩减模块关联栏、移除多余文档空宽,使默认1440×360下矩形编辑与跟踪全部可见;数字框明确可输入并拒绝非数字。示波器图像增加可访问元素及标题,工作区数字框/滑条使用平面中性色,LUT扫描结束恢复“返回调整”按钮。75保留为可恢复候选,76仍需重新签名公证与正式宿主验收。画布钢笔真实鼠标闭合和重复切换仍未确认,不把尝试点击写成通过。 diff --git a/verification/Delivery.json b/verification/Delivery.json index 86eb25c..2d3e1f7 100644 --- a/verification/Delivery.json +++ b/verification/Delivery.json @@ -3,14 +3,14 @@ "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", "bundleID": "com.dayu.color", "version": "1.12.0", - "build": "74", + "build": "75", "team": "B3W25FX5H5", - "notaryID": "b666b44e-83d3-4edd-88e7-f0c5cf83f8ce", + "notaryID": "6a271e18-727a-45b6-972d-fcf2d2155d36", "notaryStatus": "Accepted", "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", - "sourceCommit": "226b7e1e93dfd5fa2ee2f002fdc828077a2f7f46", + "sourceCommit": "0ef847f6bb181f11d4040e7516932ffbbac615a2", "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", "templateSHA256": "eaf60224f8d970f8841a03fe0325adc4af73d1c017375b020bcc0e256f0cd803", "shaderSHA256": "7d05797e5e68ec8c23886c74d37a32826843c541e13a3f35424c1903e28bff56", - "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-80dd0728de5d4b8ea651d4de529c4583.app" + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-6b3a3828ed464ca5835d97e6593f61e5.app" } diff --git a/verification/InstalledSelfTest.json b/verification/InstalledSelfTest.json index 1c72ffd..77275a0 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": 787, + "checks": 813, "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/832327DF-9055-48E2-B37F-1D7802BE4DA6" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B" }, { "descriptors": 285, @@ -890,7 +890,7 @@ "error": "未提供错误信息", "name": "renderer-export-33cube", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6/diagnostic-export.cube" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B/diagnostic-export.cube" }, { "bytes": 1186074, @@ -910,7 +910,7 @@ }, { "heartbeats": 0, - "maximumGapMS": 57.407749991398305, + "maximumGapMS": 61.14662499749102, "name": "external-activation-main-loop-responsive", "pass": true }, @@ -1252,7 +1252,7 @@ "pass": true }, { - "name": "workspace-six-mask-editors-fit-377-600-860-1200-point-widths", + "name": "workspace-six-mask-editors-flow-horizontally-at-235-point-height", "pass": true }, { @@ -1342,7 +1342,7 @@ "pass": true }, { - "name": "workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture", + "name": "workspace-layer-driven-editing-has-no-root-tabs-and-four-persistent-scopes", "pass": true }, { @@ -1350,16 +1350,15 @@ "pass": true }, { - "name": "workspace-scopes-page-enables-only-visible-output-capture", + "name": "workspace-scope-shortcut-preserves-adjustment-editor-and-capture", "pass": true }, { - "closePixels": 5468, - "headingPixels": 4891, - "name": "workspace-offscreen-topbar-heading-pages-close-render-pixels", - "pagesPixels": 29505, + "closePixels": 128, + "name": "workspace-offscreen-compact-icons-and-close-render-pixels", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6/workspace-topbar.png" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B/workspace-topbar.png", + "toolbarPixels": 3867 }, { "name": "workspace-content-and-scope-pane-explicitly-clip", @@ -1374,11 +1373,10 @@ "pass": true }, { - "closePixels": 5468, - "headingPixels": 4632, - "name": "workspace-topbar-survives-resize-and-large-dirty-redraw", - "pagesPixels": 29807, - "pass": true + "closePixels": 128, + "name": "workspace-topbar-survives-minimum-resize-and-large-dirty-redraw", + "pass": true, + "toolbarPixels": 3867 }, { "name": "workspace-reopens-existing-host-remote-window", @@ -1422,7 +1420,7 @@ }, { "name": "workspace-independent-style-fixture-inserted", - "node": "95F11B8A-C28B-4216-9C1E-996B69FD5792", + "node": "8B8DCE90-30C7-4FD3-9DD2-AD3756D00985", "pass": true, "validDocument": true }, @@ -1431,10 +1429,10 @@ "error": "none", "name": "workspace-independent-style1-writes-target-node-inside-undo", "nodePaths": { - "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6/node.cube" + "look0": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B/node.cube" }, "pass": true, - "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6/user-new.cube", + "rootStyle1": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B/user-new.cube", "undoStartsAfter": 3, "undoStartsBefore": 2, "written": true @@ -1492,34 +1490,34 @@ "buttons": 5, "frames": [ { - "button": "{{142, 2}, {26, 26}}", - "cell": "{{0, 0}, {174, 30}}", - "table": "{{142, 2}, {26, 26}}", - "visible": "{{0, 0}, {174, 185}}" + "button": "{{145, 2}, {24, 24}}", + "cell": "{{0, 0}, {174, 28}}", + "table": "{{145, 2}, {24, 24}}", + "visible": "{{0, 0}, {174, 229}}" }, { - "button": "{{142, 2}, {26, 26}}", - "cell": "{{0, 0}, {174, 30}}", - "table": "{{142, 32}, {26, 26}}", - "visible": "{{0, 0}, {174, 185}}" + "button": "{{145, 2}, {24, 24}}", + "cell": "{{0, 0}, {174, 28}}", + "table": "{{145, 30}, {24, 24}}", + "visible": "{{0, 0}, {174, 229}}" }, { - "button": "{{142, 2}, {26, 26}}", - "cell": "{{0, 0}, {174, 30}}", - "table": "{{142, 62}, {26, 26}}", - "visible": "{{0, 0}, {174, 185}}" + "button": "{{145, 2}, {24, 24}}", + "cell": "{{0, 0}, {174, 28}}", + "table": "{{145, 58}, {24, 24}}", + "visible": "{{0, 0}, {174, 229}}" }, { - "button": "{{142, 2}, {26, 26}}", - "cell": "{{0, 0}, {174, 30}}", - "table": "{{142, 92}, {26, 26}}", - "visible": "{{0, 0}, {174, 185}}" + "button": "{{145, 2}, {24, 24}}", + "cell": "{{0, 0}, {174, 28}}", + "table": "{{145, 86}, {24, 24}}", + "visible": "{{0, 0}, {174, 229}}" }, { - "button": "{{142, 2}, {26, 26}}", - "cell": "{{0, 0}, {174, 30}}", - "table": "{{142, 122}, {26, 26}}", - "visible": "{{0, 0}, {174, 185}}" + "button": "{{145, 2}, {24, 24}}", + "cell": "{{0, 0}, {174, 28}}", + "table": "{{145, 114}, {24, 24}}", + "visible": "{{0, 0}, {174, 229}}" } ], "name": "workspace-native-row-bypass-buttons-remain-visible-at-minimum-width", @@ -1531,21 +1529,43 @@ "pass": true }, { - "name": "workspace-lut-segment-rebinds-from-layer-a-to-b-without-cross-writing", + "name": "workspace-stylized-lut-row-opens-browser-with-scopes-still-visible", "pass": true }, { - "name": "workspace-switching-lut-target-stays-on-visible-browser-page", + "name": "workspace-lut-layer-selection-rebinds-from-layer-a-to-b-without-cross-writing", + "pass": true + }, + { + "name": "workspace-switching-lut-target-directly-shows-browser", "pass": true }, { "name": "workspace-switching-lut-layer-cancels-inflight-load-and-preserves-both-targets", "pass": true }, + { + "name": "workspace-lut-return-to-adjustments-survives-model-refresh", + "pass": true + }, + { + "name": "workspace-reselect-lut-layer-reopens-browser", + "pass": true + }, { "name": "workspace-shared-mask-links-hsl-and-spider-as-one-author-object", "pass": true }, + { + "name": "workspace-layer-mask-symbol-enters-shared-mask-editor-with-persistent-scopes", + "pass": true + }, + { + "mask": "{{0, 0}, {876, 295}}", + "name": "workspace-mask-editor-and-assignments-fit-height-without-vertical-scrollers", + "pass": true, + "viewport": "{446, 295}" + }, { "name": "workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings", "pass": true @@ -1558,6 +1578,123 @@ "name": "workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo", "pass": true }, + { + "document": "{{0, 0}, {1813, 235}}", + "name": "workspace-horizontal-minimum-height-primary", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {693, 235}}", + "name": "workspace-horizontal-minimum-height-spider", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "name": "workspace-spider-places-disc-left-and-parameters-right", + "pass": true + }, + { + "document": "{{0, 0}, {790, 235}}", + "name": "workspace-horizontal-minimum-height-base", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-skin", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-look", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {686, 235}}", + "name": "workspace-horizontal-minimum-height-hsl", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {550, 235}}", + "name": "workspace-horizontal-minimum-height-curve", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {1172, 235}}", + "name": "workspace-horizontal-minimum-height-grading", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-primaries", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-levels", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {528, 235}}", + "name": "workspace-horizontal-minimum-height-blackwhite", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-balance", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {528, 235}}", + "name": "workspace-horizontal-minimum-height-mixer", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {528, 235}}", + "name": "workspace-horizontal-minimum-height-film", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "document": "{{0, 0}, {424, 235}}", + "name": "workspace-horizontal-minimum-height-lens", + "outside": [], + "pass": true, + "viewport": "{424, 235}" + }, + { + "name": "workspace-background-remote-reply-attaches-only-current-session", + "pass": true + }, + { + "name": "workspace-repeated-inspector-and-remote-recreation-keeps-current-session", + "pass": true + }, { "name": "workspace-size-mode-keeps-selection-and-recreates-only-host-window", "pass": true @@ -2536,7 +2673,7 @@ "pass": true }, { - "coveredPixels": 6080, + "coveredPixels": 12988, "name": "native-osc-real-metal-overlay-transparent-around-controls", "pass": true }, @@ -2662,6 +2799,18 @@ "name": "pen-refuses-to-finish-stale-draft-after-playhead-moves", "pass": true }, + { + "name": "shared-pen-close-keeps-three-point-bezier-before-author-write", + "pass": true + }, + { + "name": "shared-pen-close-persists-same-path-and-both-module-references-once", + "pass": true + }, + { + "name": "inspector-parameter-burst-coalesces-to-one-deferred-refresh", + "pass": true + }, { "name": "native-pen-panel-routes-redraw-finish-and-cancel-to-own-mask", "pass": true @@ -3856,7 +4005,7 @@ { "name": "viewer-real-osc-draws-minimal-curve-on-clear-canvas", "pass": true, - "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6/viewer-workspace.png" + "path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B/viewer-workspace.png" }, { "name": "canvas-hsl-plot-captures-outside-and-commits-one-undo", @@ -3997,6 +4146,6 @@ "pass": true } ], - "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/832327DF-9055-48E2-B37F-1D7802BE4DA6", + "runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/ABC8B12C-BB6F-4821-B379-EB065F920B3B", "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/大鱼调色/Plugin/DYColorWorkspace.mm b/大鱼调色/Plugin/DYColorWorkspace.mm index b829d3e..a0175f2 100644 --- a/大鱼调色/Plugin/DYColorWorkspace.mm +++ b/大鱼调色/Plugin/DYColorWorkspace.mm @@ -59,9 +59,10 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b - (BOOL)isFlipped{return YES;} - (BOOL)isOpaque{return YES;} - (void)dealloc{[_metadata release];[_raster release];[super dealloc];} +- (BOOL)isAccessibilityElement{return YES;} - (NSString*)scopeTitle{return @[@"亮度波形",@"RGB 分列",@"直方图",@"矢量图"][_mode];} - (void)setMetadata:(NSDictionary*)data{ - if(_metadata==data)return;[_metadata release];_metadata=[data copy];[_raster release];_raster=nil; + if(_metadata==data&&self.accessibilityLabel.length)return;[_metadata release];_metadata=[data copy];[_raster release];_raster=nil; NSString *key=_mode==0?@"waveform":_mode==1?@"parade":@"vectorscope";NSUInteger width=_mode==0?dyscope::Width:_mode==1?3*dyscope::Width:dyscope::Bins;NSData *bytes=_mode==2?nil:data[key]; if(bytes.length==width*dyscope::Bins*4){NSBitmapImageRep *rep=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil pixelsWide:width pixelsHigh:dyscope::Bins bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:width*4 bitsPerPixel:32]autorelease];memcpy(rep.bitmapData,bytes.bytes,bytes.length);_raster=[[NSImage alloc]initWithSize:NSMakeSize(width,dyscope::Bins)];[_raster addRepresentation:rep];} self.accessibilityLabel=[NSString stringWithFormat:@"%@ · %@ · 有效取样 %@",self.scopeTitle,data[@"domain"]?:@"等待画面",data[@"valid"]?:@0];[self setNeedsDisplay:YES]; diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 57da6f6..8da4684 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -85,6 +85,7 @@ static NSString *DYNumber(double value,NSDictionary *d) { } - (void)drawBarInside:(NSRect)rect flipped:(BOOL)flipped { NSRect track=NSMakeRect(rect.origin.x,NSMidY(rect)-2.5,rect.size.width,5); + if(DYThemeWorkspaceContext(self.controlView)&&![self trackColors]){NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];[[NSColor colorWithWhite:DYThemeIsLight()?.64:.29 alpha:1]setFill];[bar fill];double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue);NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));[[NSColor colorWithWhite:DYThemeIsLight()?.36:.69 alpha:1]setFill];[[NSBezierPath bezierPathWithRoundedRect:active xRadius:2.5 yRadius:2.5]fill];return;} if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(track,-.5,-1),3.5,YES,NO,NO); NSArray *colors=[self trackColors];if(colors){NSGradient *g=[[[NSGradient alloc]initWithColors:colors]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5] angle:0];return;} NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];NSGradient *base=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot8"] endingColor:DYThemePalette()[@"slot9"]]autorelease];[base drawInBezierPath:bar angle:90];[[(DYThemeIsLight()?DYAccent():NSColor.blackColor) colorWithAlphaComponent:DYThemeIsLight()?.20:.28]setStroke];bar.lineWidth=.6;[bar stroke]; @@ -93,6 +94,7 @@ static NSString *DYNumber(double value,NSDictionary *d) { } - (void)drawKnob:(NSRect)knobRect { NSRect circle=NSInsetRect(knobRect,1,1); + if(DYThemeWorkspaceContext(self.controlView)){[[NSColor colorWithWhite:DYThemeIsLight()?.94:.87 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:circle]fill];return;} if(DYThemeIsLight()){DYDrawSoftControl(circle,MIN(circle.size.width,circle.size.height)/2,NO,NO,self.highlighted);return;} [DYThemeColor(@"knob") setFill];[[NSBezierPath bezierPathWithOvalInRect:circle] fill]; [DYAccent() setStroke];NSBezierPath *ring=[NSBezierPath bezierPathWithOvalInRect:circle];ring.lineWidth=.7;[ring stroke]; @@ -103,7 +105,8 @@ static NSString *DYNumber(double value,NSDictionary *d) { @implementation DYNumberFieldCell - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { NSRect rect=NSInsetRect(frame,.5,.5);NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.5 yRadius:2.5]; - if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO); + if(DYThemeWorkspaceContext(view)){[[NSColor colorWithWhite:DYThemeIsLight()?.82:.19 alpha:1]setFill];[p fill];[[NSColor colorWithWhite:DYThemeIsLight()?.55:.34 alpha:1]setStroke];p.lineWidth=.5;[p stroke];} + else if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO); else{NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot5"] endingColor:DYThemePalette()[@"slot4"]]autorelease];[gradient drawInBezierPath:p angle:90];[[DYThemePalette()[@"accent"]colorWithAlphaComponent:.65]setStroke];p.lineWidth=.9;[p stroke];} [NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];[NSGraphicsContext restoreGraphicsState]; } diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 67ee78f..fc950f0 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -466,7 +466,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b } - (void)endLibraryTask { [_libraryTask release];_libraryTask=nil;[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil; - _importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=@"完成";_done.toolTip=nil; + _importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=_embedded?@"返回调整":@"完成";_done.toolTip=nil; } - (void)reloadLibrary:(id)sender{ if(_libraryTask){[_libraryTask cancel];[self setStatus:@"正在取消…"];return;} diff --git a/大鱼调色/Plugin/DYMaskPanel.inc.h b/大鱼调色/Plugin/DYMaskPanel.inc.h index b3fdb46..a135214 100644 --- a/大鱼调色/Plugin/DYMaskPanel.inc.h +++ b/大鱼调色/Plugin/DYMaskPanel.inc.h @@ -18,7 +18,7 @@ - (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];} - (CGFloat)contentHeight{return _workspaceMode?self.bounds.size.height:_contentHeight;} - (CGFloat)contentWidth{ - if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL actions=(_tracking.count&&![_tracking[0]isHidden])||!_penRedraw.hidden;BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actionWidth=actions?216:0;if(pen&&shape&&self.bounds.size.height<242)actionWidth+=216;return MAX(620,16+ceil(double(count)/perColumn)*214+actionWidth+216); + if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=216;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions); } - (void)selectMaskID:(NSString*)maskID{ if([_maskID isEqual:maskID]){if(!_canvasActive)[self canvas:nil];return;}BOOL found=NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID]){found=YES;break;}if(!found)return; @@ -44,7 +44,7 @@ _penCancel=[DYButton(@"取消绘制",self,@selector(penCommand:))retain];_penCancel.toolTip=@"取消当前绘制,保留原蒙版路径";_penCancel.accessibilityLabel=@"取消钢笔绘制";[self addSubview:_penCancel]; _clear=[DYButton(@"清除轨迹",self,@selector(clear:))retain];[self addSubview:_clear]; NSArray *names=@[@"强度",@"羽化",@"中心 X",@"中心 Y",@"宽度",@"高度",@"旋转",@"渐变宽度",@"色相中心",@"色相范围",@"色相柔边",@"饱和度下限",@"饱和度上限",@"亮度下限",@"亮度上限",@"输入黑",@"输入白",@"输入伽马"]; - for(NSInteger i=0;ih-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;} // Pen and tracking actions get adjacent columns when the short strip cannot @@ -99,7 +99,7 @@ - (void)enabled:(NSButton*)sender{[self edit:@"启停蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"enabled"]=@(sender.state==NSControlStateValueOn);}];} - (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];} - (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} -- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} +- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];} - (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;} - (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;} - (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;} diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index efc8f19..61ea2fd 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -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"],*toolbar=[workspace valueForKey:@"toolbar"],*closeButton=[workspace valueForKey:@"_close"];NSArray *plots=[workspace valueForKey:@"scopePlots"];BOOL tabs=NO;for(NSView *view in root.subviews)tabs|=[view isKindOfClass:NSSegmentedControl.class]; run.record(@"workspace-layer-driven-editing-has-no-root-tabs-and-four-persistent-scopes",!tabs&&plots.count==4&&!scopePane.hidden&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&[(NSSplitView*)[workspace valueForKey:@"split"]subviews].count==3); + BOOL plotsAccessible=YES;for(NSView *plot in plots)plotsAccessible&=plot.isAccessibilityElement&&plot.accessibilityLabel.length>0;run.record(@"workspace-all-four-scope-images-have-accessible-titles",plotsAccessible); run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==840&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360); [workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scope-shortcut-preserves-adjustment-editor-and-capture",[[workspace valueForKey:@"editorMode"]integerValue]==0&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]); NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton); @@ -108,7 +109,10 @@ chooseNode(@"base:hsl");NSArray *entryRows=[stack valueForKey:@"layerRows"];NSInteger entryRow=-1;for(NSUInteger i=0;i=0&&[[stack valueForKey:@"selectedMask"]isEqual:sharedID]&&[[stack valueForKey:@"editorMode"]integerValue]==1&&![(NSView*)[stack valueForKey:@"scopePane"]isHidden]); + [stack setValue:@.18 forKey:@"splitFraction"];[stack setValue:@.27 forKey:@"scopeFraction"];[stackHost->_parent setFrameSize:NSMakeSize(1440,360)];[(NSView*)[stack valueForKey:@"root"]layoutSubtreeIfNeeded]; NSScrollView *maskStrip=[stack valueForKey:@"maskScroll"],*assignStrip=[stack valueForKey:@"assignmentScroll"];NSView *maskContent=maskStrip.documentView;[maskContent layoutSubtreeIfNeeded];BOOL maskFits=YES;for(NSView *view in maskContent.subviews)if(!view.hidden)maskFits&=NSContainsRect(maskContent.bounds,view.frame); + run.record(@"workspace-default-wide-strip-keeps-entire-rectangle-editor-visible",maskContent.frame.size.width<=maskStrip.contentSize.width+1&&maskFits,@{@"document":NSStringFromRect(maskContent.frame),@"viewport":NSStringFromSize(maskStrip.contentSize)}); + BOOL fieldsEditable=YES;for(NSDictionary *row in [maskContent valueForKey:@"rows"])if(![row[@"label"]isHidden])fieldsEditable&=[row[@"field"]isEditable]&&[row[@"field"]isSelectable];run.record(@"workspace-mask-number-fields-accept-direct-editing",fieldsEditable); run.record(@"workspace-mask-editor-and-assignments-fit-height-without-vertical-scrollers",!maskStrip.hasVerticalScroller&&!assignStrip.hasVerticalScroller&&fabs(maskContent.frame.size.height-maskStrip.contentSize.height)<1&&maskFits,@{@"mask":NSStringFromRect(maskContent.bounds),@"viewport":NSStringFromSize(maskStrip.contentSize)}); [stack deleteWorkspaceSelection:nil];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSView *maskEditor=[stack valueForKey:@"maskEditor"]; run.record(@"workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",!DYSharedMaskWithID(tools,sharedID)&&!DYMasksForTool(tools,@"base:hsl").count&&!DYMasksForTool(tools,@"base:spider").count&&![[stack valueForKey:@"selectedMask"]length]&&(!maskEditor||!maskEditor.superview||maskEditor.hidden)); diff --git a/大鱼调色/Plugin/DYWorkspaceTools.inc.h b/大鱼调色/Plugin/DYWorkspaceTools.inc.h index 48a95fe..10330a6 100644 --- a/大鱼调色/Plugin/DYWorkspaceTools.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceTools.inc.h @@ -28,8 +28,8 @@ _toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+divider,0,editor,h);_scopePane.frame=NSMakeRect(left+divider+editor+divider,0,scope,h); _layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*_layerTable.rowHeight));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28); CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29)); - _maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(230,MAX(160,ew*.25));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height); - if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(620,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];} + _maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(188,MAX(152,ew*.23));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height); + if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(536,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];} [self layoutMaskAssignments]; _sizingSplit=NO; } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index cfbd092..623b490 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 75 + 76 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 0b126ba..d812494 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 75 + 76 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright