比较提交

...
共修改 27 个文件,包含 3758 行新增和 152 行删除

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

+15
查看文件
@@ -0,0 +1,15 @@
大鱼调色 1.8.5(67)
- 只保留“浅色 / 深色”两个明确的文字切换,移除其它主题和彩色色签。
- 浅色使用冰蓝表面、深青文字、柔和浮雕与定向反光边。
- 深色使用中性炭黑、浅色文字、高亮细边与局部青蓝光晕。
- 按钮、模块、数值框与滑杆采用同一套层次语言,曲线继续显示亮度与RGB直方图叠层。
610项正式原生检查与FCP12.4界面验收通过;外观切换前后完整调色预设保持一致。调色数学、CMS、模板与预设格式保持原合同。
支持Apple Silicon,macOS14.6及以上,Final Cut Pro / Motion。APP与安装包已完成Developer ID签名、Apple公证与票据验证,安装位置为/Library/Plug-Ins/FxPlug/大鱼调色.app。本轮APP独立安装验收,PKG展开验包未重复执行安装脚本。
安装包:大鱼调色-1.8.5.pkg
大小:43010987字节
SHA-256:b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b
实际编译源码:d39004c26af3c0c5853111faef7e40e6c66f6aa6
+18
查看文件
@@ -1,3 +1,19 @@
# 1.8.5(67)浅色 / 深色双模式
远程 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码d39004c26af3c0c5853111faef7e40e6c66f6aa6;发行标签v1.8.5-light-dark-20261104。标签完整提交、正式安装包与下载校验见verification/Release.json及Package.json。当前交接大鱼调色FxPlug4交接.md;旧配色历史以归档为准。
只保留浅色/深色两个文字按钮,旧主题已移除。浅冰蓝反光浮雕与炭黑局部光晕为同系列;内部7/8偏好ID保留,旧0–6读入回落深色,新偏好默认浅色,不自动跟随系统。主题不进入调色参数。610项正式原生检查、FCP两模式实看/切换、57,600直方图采样和前后8,590字节完整预设一致通过。HostTwoModes1.8.5.json说明实际验收与未覆盖范围。
唯一正式APP /Library/Plug-Ins/FxPlug/大鱼调色.app,主ID com.dayu.color,内部com.dayu.color.XPC;Release/Developer ID团队B3W25FX5H5。APP公证bf104b1f-5161-4970-8d8a-170989825747 Accepted,票据、Gatekeeper与正式启动通过。PKG独立签名公证与20项展开验包结果见最终Package.json;APP独立替换并验收,未重复运行PKG安装脚本。
ColorManagement包含8个依赖归档及许可证,无LFS/子模块。恢复需Xcode27.1、FxPlug SDK4.3.5、Apple Silicon/macOS14.6+及独立保存的签名/公证凭据;Git不包含密钥。按下文恢复依赖,检出具体完整SHA后Release构建,再运行tools/deliver.py按正式签名公证安装并宿主验收,通过后Packaging/build_pkg.py。必要资源与源码/版本标签独立检出核验见SoftRecovery1.8.5.json;未宣称独立重新编译。
正式发行包输出../发行包/大鱼调色-1.8.5.pkg;66已验包但未发布的候选由最终67替代,保留证据Soft66Package.json,临时文件按SoftCleanup1.8.5.json清理。历史发行包/标签、源码和私人QA媒体保留。本轮未改NAS后端、网站文章或自动更新清单。
最终67正式PKG 43010987字节,SHA-256 b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b,公证04fae6f1-7e38-4ab4-8c12-7bcae0ea77fd Accepted,Installer签名/票据/Gatekeeper及20项展开验包通过。源码及正式包记录随v1.8.5-light-dark-20261104标签保存;实际Release/下载回读另见后续Release.json。
---
# 1.8.4(64)统一底色与模块按钮强化
仓库 https://dayu.media/git/dayu/dayu-color.git,main。实际编译源码55b66a358cf4c52eeb6ad89acde822cb73be3137,发行标签v1.8.4-refined-neon-20261104;完整标签SHA和下载校验见Release.json。正式位置/身份/依赖沿用下文,完整当前交接见大鱼调色FxPlug4交接.md。
@@ -8,6 +24,8 @@
发行包../发行包/大鱼调色-1.8.4.pkg,43009859字节,SHA-256 59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660。源码、安装包、标签、完整下载与恢复范围见对应verification报告。未修改网站文章或自动更新清单。
Release385/附件29已发布,草稿及发布后完整下载均验证通过。标签完整SHA fe7ddbd6f89b4ee3c7af9dd61e94d99056f414e8;远程独立恢复485个文件及8个依赖归档,编译输入一致。临时恢复与下载副本已清理,详见RefinedRecovery1.8.4.json和RefinedCleanup1.8.4.json。
---
# 1.8.3(62)多色渐变与曲线直方图
@@ -0,0 +1,35 @@
# 大鱼调色开发交接
2026-11-04,Asia/Shanghai。本轮正式版本1.8.4(64),实际编译源码55b66a358cf4c52eeb6ad89acde822cb73be3137。远程 https://dayu.media/git/dayu/dayu-color.git,main。实际工程 /Volumes/备份/大鱼调色/大鱼调色,Wrapper Application / Release,Objective-C++/AppKit;Apple Silicon,macOS14.6+,本机Xcode27.1/FxPlug4.3.5。
唯一正式APP /Library/Plug-Ins/FxPlug/大鱼调色.app;ID com.dayu.color / com.dayu.color.XPC。固定缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。签名团队B3W25FX5H5,公证profile codex-dayu-notary-B3W25FX5H5;具体Accepted记录见verification/Delivery.json。不要另建/Applications副本。交付/仓库锁按本机全局规则。
## 本轮明确的视觉反馈
用户否定1.8.3“大红大绿”的分模块彩虹色块,只认可保存预设的渐变。候选63改为统一低饱和近黑、轻微暖紫的表面,**该底色已获用户明确认可**。用户随后要求模块/图层按钮强化显示。最终64完整保留63的paletteRGB和DYDrawThemeSurface,不再改底色;只给模块名称小按钮添加统一轻粉青渐变、细边和更亮展开态,给蒙版/删除/再加一层按钮增加低对比底板与更亮图标。保存预设保留原粉紫—青色渐变。
后续不要恢复统一大紫底、深蓝灰方案或按模块分配红绿橙色。底色认可不等于用户已对每个按钮细节作最终美学评价。当前默认炫彩ID6,旧0–5及明确保存的旧选择不改编号;偏好域com.dayu.color.preferences/themeIndex。主题/按钮外观不写调色参数或预设。
关键修改仅DYTheme.mm、DYInspector.mm及两个Info.plist。没有改变调色数学、GPU、Uniform、参数ID、CMS、模板或预设格式。模块标题按原state绘更亮展开态;右侧操作仅增加identifier=layerAction用于绘制,原tag/target/action不变。不同主题继续使用既有配色。
## 验证与交付
605项正式原生检查通过。FCP12.4从正式位置加载1.8.4(64),实看统一底色、强化标题/图层操作底板,展开/折叠正常,直方图拿到57,600采样。前后完整预设均8,590字节、逐字节一致,SHA-256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。详见HostRefined1.8.4.json、InstalledSelfTest.json及research/ui-refined-20261104/validation.md。
本轮正式宿主退出后载入新安装版本;未另做相同64版的第二次冷重开、VoiceOver/系统辅助显示矩阵或Instruments采样。280/320/400栏宽及CMS nil/v2/v3不变使用既有原生检查。源码确认用户认可的底色与表面绘制逐字保留。不要把数值检查/暂定评分当作用户美学认可。
APP公证34af6e05-cba5-4031-9184-762f758c0889为Accepted,签名、票据、Gatekeeper及唯一发现路径通过。候选63公证记录保存在RefinedCandidate63.json,仅用于视觉沟通,未发布包。正式PKG/Release最终状态见Package.json、Release.json;标签v1.8.4-refined-neon-20261104关联最终包记录,发布后回读另作main提交,不移动标签。APP独立正式安装验收;PKG展开验包不代表重复运行安装脚本。
## 保持的技术合同
直方图沿用320×180浮点分析缓存、256档、最多2Hz;透明/非有限像素不计,范围外归端点,共同峰值平方根缩放。RGB页叠亮度与三色,单色页仅相应通道。原流程分析源为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前;不是最终输出/HDR示波器,不保证每个曲线层即时输入。统计在工作线程,UI只画快照;缓存按renderer隔离,失效清空。不要增加全尺寸读取或UI线程像素统计。
完整预设v7,nil/v2/v3 CMS及模板原默认保持,高级颜色设置默认收起、展开不改参数。完整CMS、UI和恢复历史见research/handoffs/DayuColorThrough1.8.3-20261104.md及其引用的更早交接。源码依赖归档/许可证在ColorManagement,无LFS/子模块;证书/密钥不在Git。本轮未修改NAS后端、网站文章或自动更新清单。
## 后续流程
读取当前工作区与实际正式版本,保护其他任务改动。tools/checkpoint.py仅对明确路径提交/推送并核验main,自带仓库锁。tools/deliver.py持有产品交付锁直到宿主验收,保持HEAD以记录实际编译SHA,通过后输入complete。Packaging/build_pkg.py和Packaging/publish_beta.py复用PKG工坊制作、展开校验和Release完整下载;草稿404按历史指南用已登录浏览器下载真实附件后传--verified-download,不重复上传/提前发布。
只清理本任务生成APP、旧安装备份、提交ZIP、下载和恢复clone;保留正式包、源码、历史包、私人QA媒体。恢复说明RECOVERY.md及对应最终验证报告;Git不替代证书的独立安全备份。
最终Release385/附件29已发布:https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.4-refined-neon-20261104。标签提交fe7ddbd6f89b4ee3c7af9dd61e94d99056f414e8;草稿浏览器下载与发布后再次完整下载均核对43009859字节和SHA-256 59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660。远程独立检出485个跟踪文件、8个依赖源包和编译输入一致通过;本轮未独立重编。临时恢复clone、下载副本、生成APP、提交ZIP及旧安装备份按RefinedCleanup1.8.4.json清理;正式包和历史包保留。
+15
查看文件
@@ -0,0 +1,15 @@
# 冰蓝柔光界面
2026-11-04。目标:将用户参考的浅冰蓝拟物语言应用到现有 FCP 调色检查器;按钮和模块边框用定向高光反射强化。最新请求取代先前深色底的视觉要求,原交接仅作历史资料。
采用 standard 交互:原生按钮、弹出菜单、滑杆、数值输入、折叠和蒙版动作不变。比较整卡彩色、仅标题描边、统一浮起冰蓝卡片三种层级,选统一卡片加局部粉彩强调。保留现有参数结构,避免彩色模块争抢注意力。支持 280/320/400 宽检查器与嵌套层。
新增稳定主题 ID7“冰蓝柔光”,旧 0–6 不改号;新用户默认7,已有明确选择保留。浅冰蓝实色底,深青文字;白色左上反光、冷蓝右下细边、柔和投影形成凸起,数值与滑轨用内凹深度,主操作用低饱和蓝紫—青渐变。展开态加强轮廓,按下态降低浮起感;无新动画或透明材质。增强对比度时改为明确边框,减少透明度时取消装饰阴影,文字不发光。
状态仍由已有模型与按钮 state 管理;主题只写独立偏好,不写工程调色。直方图算法、工作线程、采样频率、CMS、GPU、预设和模板保持原合同;图表配色适配浅色背景并保留 RGB 语义。
验证:现有原生检查、文字与控件对比、窄栏布局、正式公证安装后 FCP 实看和折叠/主题切换、完整预设前后一致。最后完成 PKG、Release 下载校验、独立远程检出和生成副本清理。VoiceOver 实听/完整系统辅助显示矩阵若未执行则明确记录。
用户已明确认可浅色版(“不错”),新要求补充深色同系列。保留ID7绘制与配色,新增ID8“曜石柔光”:中性炭黑、不分模块铺红绿彩底、浅色文字、冷白反射细边和局部青蓝光晕,深色数值凹槽。无文字光晕/动画。此轮最终1.8.5(66)包含双主题,65为已公证且认可的浅色候选,无单独发行包。
最新要求:删除其它主题,只留“浅色 / 深色”两个明确文字切换。替换9个彩色色签,移除旧palette与旧金色/霓虹绘制。内部保留7/8偏好ID兼容已认可选择,旧0–6读入回落深色,禁止再选择。最终构建67;66的已验包候选尚未上传Release,待最终包成功后清理。
+19
查看文件
@@ -0,0 +1,19 @@
# 冰蓝柔光验证
首次 Release 编译成功,原生预检608项中607通过;浅色文字在 calibrated RGB 转到 sRGB 后最低对比3.956,未达到4.5,交付脚本停止,原正式1.8.4未替换,也未提交Apple。已加深次要文字与行标签,并将强调色文字纳入对比检查,随后重跑完整预检。
修正后608项全部通过;新主题正文、次要文字、行标签、强调文字在7种表面上的最低sRGB对比4.613。主题切换不写调色或撤销栈;原生控件使用Aqua。0–6旧主题编号保留,新增7。宽280/320/400标题栏按钮布局及既有曲线/直方图/CMS检查通过。
正式1.8.5(65)已Accepted、票据及Gatekeeper通过后安装,608项正式安装自检通过。FCP12.4实际进程使用正式路径,观察浅冰蓝底、深青文字、白/冷蓝定向反射边、图层操作小凸起按钮、基础调整展开态及凹槽滑杆/数值框。曲线浅底叠层显示57,600采样,显隐有效。正常退出FCP并冷重开同版后冰蓝主题保留。完整预设前后8,590字节逐字节一致。
没有新增动画/透明材质;增强对比使用明确实边,减少透明度取消装饰阴影。没有执行VoiceOver实听、完整系统辅助显示矩阵或Instruments;无实测帧率声明。SwiftUI扫描不适用AppKit项目。LUT浏览器外观已适配但未单独打开实看。
设计复核第二遍已按文字对比修正,原生动作和密度保持。Apple Fidelity暂定85/100(平台14、布局13、视觉14、交互17、材质13、辅助6、实现8),受辅助技术/性能证据上限约束;不是用户美学认可,也不称达到90或Apple品质。
用户认可浅色版后追加曜石柔光(ID8)。浅色palette第7行及浮雕绘制主体与65逐字相同,新增深色提前分支,不覆写浅色参数。最终66预检611项全部通过;深色最低sRGB文字对比5.665,DarkAqua、无文字光晕、主题切换不写模型/撤销通过。光晕为静态NSShadow,仅围绕表面,辅助显示选项下关闭。
正式66:611项安装自检通过,FCP实际正式路径加载。深色卡片/按钮反射细边、局部青蓝表面光晕、浅色文字、基础调整展开/收起与滑杆数值凹槽实看;LUT浏览窗口深色配色正常,完成退出未应用LUT。7/8双主题切换,直方图57,600采样可用。前后完整预设8,590字节逐字节相同。深色8未做同版第二次冷重开;不将65浅色冷重开说成66深色冷重开。最终仍不声称完整VoiceOver/系统辅助显示/Instruments覆盖。
最终精简67:旧0–6主题palette与入口已删除,只留两个44pt文字按钮;内部7/8偏好ID兼容已有选择。两套浮雕绘制主体与66逐字相同。610项预检通过;旧金色/霓虹相关检查随功能退役,保留深浅对比度、模型不变与直方图检查,并核验旧模式不可再选。最终宿主与发行结果以下续记。
最终67正式位置签名/票据/Gatekeeper及610项安装检查通过,FCP实际载入67。顶部只有浅色/深色两个文字按钮,实看两模式并切换回深色,旧彩色色签消失。升级前正常退出/重开后深色偏好恢复。预设最终仍为8,590字节且与首次基线逐字节相同;直方图57,600采样可用。本轮无额外67同版第二次冷重开。
+5 -5
查看文件
@@ -2,15 +2,15 @@
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.4",
"build": "64",
"version": "1.8.5",
"build": "67",
"team": "B3W25FX5H5",
"notaryID": "34af6e05-cba5-4031-9184-762f758c0889",
"notaryID": "bf104b1f-5161-4970-8d8a-170989825747",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
"sourceCommit": "d39004c26af3c0c5853111faef7e40e6c66f6aa6",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
"hostVerification": "verification/HostRefined1.8.4.json"
"hostVerification": "verification/HostTwoModes1.8.5.json"
}
+34
查看文件
@@ -0,0 +1,34 @@
{
"version": "1.8.5",
"build": "66",
"host": "Final Cut Pro 12.4",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"compiledSource": "07a3f7bd4d32a544c9d045768d93ebfd30e8a48d",
"nativeChecks": 611,
"checks": {
"light65PaletteAndReliefBodyPreservedByteIdentical": true,
"neutralCharcoalSurfacesObserved": true,
"lightTextAndReflectiveRimsObserved": true,
"subtleCyanSurfaceGlowObserved": true,
"insetFieldsAndSliderTracksObserved": true,
"moduleExpandCollapse": true,
"lightDarkThemeSwitch": true,
"darkLUTBrowserOpenedAndClosedWithoutApplyingLUT": true,
"histogram57600SamplesAvailable": true,
"presetBeforeAfterByteIdentical": true
},
"preset": {
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft65-before.json",
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft66-after.json",
"bytes": 8590,
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
},
"limitations": [
"Light theme cold reopen was verified on approved65;66 was loaded after formal host restart, but no second same-build cold reopen specifically after choosing dark8.",
"No VoiceOver spoken check, full system display-setting matrix or Instruments profiling; static opaque drawing and reduced-effects paths reviewed.",
"280/320/400 layout, nine themes, CMS nil/v2/v3 and histogram contracts use native diagnostics.",
"LUT browser dark palette observed; light browser not separately observed.",
"APP independently installed; PKG expansion verification does not execute installer scripts."
],
"passResult": true
}
+33
查看文件
@@ -0,0 +1,33 @@
{
"version": "1.8.5",
"build": "65",
"host": "Final Cut Pro 12.4",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"compiledSource": "09e04ca6475cae87cc773eb33c983456d6099dd8",
"nativeChecks": 608,
"checks": {
"iceBlueLightSurfaceObserved": true,
"reflectiveWhiteBlueRimsObserved": true,
"raisedLayerActionButtonsObserved": true,
"insetNumberFieldsAndSliderTracksObserved": true,
"softPrimaryActionGradientObserved": true,
"moduleExpandCollapse": true,
"lightThemePersistsAfterSameBuildColdReopen": true,
"histogram57600SamplesAvailable": true,
"histogramHideShow": true,
"presetBeforeAfterByteIdentical": true
},
"preset": {
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft65-before.json",
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft65-after.json",
"bytes": 8590,
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
},
"limitations": [
"FCP normal-width visual acceptance; 280/320/400 header layout and CMS nil/v2/v3 invariance use native diagnostics.",
"No VoiceOver spoken validation, full system display-setting matrix or Instruments profiling; reduced-effects paths statically reviewed.",
"LUT browser light palette code adapted but separate LUT browser window not manually opened in this pass.",
"APP independently installed and tested; future PKG expansion does not mean its installer scripts were executed."
],
"passResult": true
}
+32
查看文件
@@ -0,0 +1,32 @@
{
"version": "1.8.5",
"build": "67",
"host": "Final Cut Pro 12.4",
"formalPath": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"compiledSource": "d39004c26af3c0c5853111faef7e40e6c66f6aa6",
"nativeChecks": 610,
"checks": {
"onlyTwoLabeledAppearanceButtonsObserved": true,
"legacyColorSwatchesAbsent": true,
"lightAndDarkBothObserved": true,
"bothReliefDrawingBodiesPreservedByteIdenticalTo66": true,
"modeSwitchAndExclusiveSelection": true,
"darkPreferenceRestoredOnFormalUpgradeRestart": true,
"histogram57600SamplesAvailable": true,
"presetBeforeAfterByteIdentical": true
},
"preset": {
"before": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft65-before.json",
"after": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/fcp-qa/soft67-after.json",
"bytes": 8590,
"sha256": "1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982"
},
"limitations": [
"Formal host quit/restart loaded67 with saved dark preference; no second same-build cold reopen after final button clicks.",
"Light65 same-build cold reopen, deep style and LUT browser66 acceptance retained as historical evidence; both surface drawing bodies unchanged.",
"No VoiceOver spoken check, full system display-setting matrix or Instruments profiling; reduced-effects paths statically reviewed.",
"280/320/400 widths and old appearance unselectable use native diagnostics.",
"APP independently installed; PKG expansion does not execute its installer scripts."
],
"passResult": true
}
+33 -12
查看文件
@@ -1,6 +1,6 @@
{
"bundlePath": "/Library/Plug-Ins/FxPlug/大鱼调色.app/Contents/PlugIns/大鱼调色 XPC Service.pluginkit",
"checks": 605,
"checks": 610,
"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/7B69411A-894E-4372-A7AC-4264B6778A8C"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6E057B9B-8AC5-43F0-BDC7-9E12B90F5FD4"
},
{
"descriptors": 278,
@@ -890,7 +890,7 @@
"error": "未提供错误信息",
"name": "renderer-export-33cube",
"pass": true,
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7B69411A-894E-4372-A7AC-4264B6778A8C/diagnostic-export.cube"
"path": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6E057B9B-8AC5-43F0-BDC7-9E12B90F5FD4/diagnostic-export.cube"
},
{
"bytes": 1186074,
@@ -910,7 +910,7 @@
},
{
"heartbeats": 0,
"maximumGapMS": 76.63062500068918,
"maximumGapMS": 77.39162500365637,
"name": "external-activation-main-loop-responsive",
"pass": true
},
@@ -3108,21 +3108,42 @@
"pass": true
},
{
"name": "compact-six-stable-theme-choices",
"name": "compact-only-light-dark-choices",
"pass": true
},
{
"minimumContrast": 7.243752441010932,
"name": "compact-gold-labels-have-readable-contrast",
"minimumContrast": 4.613149142137611,
"name": "soft-light-text-contrast-at-least-4.5",
"pass": true
},
{
"brightCaptionPixels": 242,
"name": "compact-gold-pull-down-draws-readable-caption",
"name": "soft-native-controls-use-light-appearance",
"pass": true
},
{
"name": "compact-gold-glow-respects-system-display-options",
"name": "soft-theme-preserves-grade-and-undo",
"pass": true
},
{
"minimumContrast": 5.664966924459792,
"name": "soft-dark-text-contrast-at-least-4.5",
"pass": true
},
{
"name": "soft-dark-native-appearance-without-text-glow",
"pass": true
},
{
"name": "soft-dark-theme-preserves-grade-and-undo",
"pass": true
},
{
"name": "compact-removed-themes-cannot-be-selected",
"pass": true
},
{
"brightCaptionPixels": 248,
"name": "compact-dark-pull-down-draws-readable-caption",
"pass": true
},
{
@@ -3162,10 +3183,10 @@
"pass": true
},
{
"name": "neon-stable-theme-id-and-no-text-glow",
"name": "relief-only-two-choices-and-no-text-glow",
"pass": true
}
],
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/7B69411A-894E-4372-A7AC-4264B6778A8C",
"runtimePath": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/verification-runtime/6E057B9B-8AC5-43F0-BDC7-9E12B90F5FD4",
"scope": "Native model and renderer integration with real Metal/IOSurface textures and fake FxPlug host selectors; no GUI or live host document."
}
+15 -15
查看文件
@@ -1,7 +1,7 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.4.pkg",
"sha256": "59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660",
"bytes": 43009859,
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.5.pkg",
"sha256": "b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b",
"bytes": 43010987,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
@@ -31,27 +31,27 @@
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.4",
"build": "64"
"version": "1.8.5",
"build": "67"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.5f127ca5-ab52-4b24-8006-4fc4584bc076/F4731F90-B2A4-4BD5-9158-90261C542B28/大鱼调色"
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.052deb06-5148-446a-b040-d2db099b96b2/EAE801B2-8F49-44F7-9C89-A587C2E9D07A/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.8.4.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 04:56:07 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.4.pkg: accepted\nsource=Notarized Developer ID",
"signature": "Package \"大鱼调色-1.8.5.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 06:28:34 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.5.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"status": "Accepted",
"id": "2632037d-733a-4092-8323-12dcf264c022",
"id": "04fae6f1-7e38-4ab4-8c12-7bcae0ea77fd",
"createdDate": "2026-11-04T06:28:38.125Z",
"name": "大鱼调色-1.8.5.pkg",
"message": "Successfully received submission info",
"createdDate": "2026-11-04T04:56:09.310Z",
"name": "大鱼调色-1.8.4.pkg"
"status": "Accepted"
},
"appCompiledSource": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
"appBuild": "64",
"appCompiledSource": "d39004c26af3c0c5853111faef7e40e6c66f6aa6",
"appBuild": "67",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
@@ -59,6 +59,6 @@
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostRefined1.8.4.json",
"installedAppHostAcceptance": "verification/HostTwoModes1.8.5.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。"
}
+11 -1
查看文件
@@ -3,5 +3,15 @@
"/Library/Plug-Ins/FxPlug/.dayu-color-previous-63e3ea59f6744c2ea3d226642d4bef75.app"
],
"scope": "Generated backups from this task only; user QA media and historical packages preserved.",
"passResult": true
"passResult": true,
"downloadCopiesRemoved": [
"/Volumes/备份/大鱼调色-1.8.4.pkg"
],
"temporaryRecoveryCloneRemoved": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-refined-f98wbwo7",
"generatedBuildAppRemaining": [],
"generatedInstallBackupsRemaining": [],
"formalPackagePath": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.4.pkg",
"releaseID": 385,
"assetID": 29,
"finalInstalledSignatureTicketGatekeeper": true
}
+24
查看文件
@@ -0,0 +1,24 @@
{
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-refined-f98wbwo7",
"compiledSource": "55b66a358cf4c52eeb6ad89acde822cb73be3137",
"gitFsck": "full strict passed",
"scope": "Independent remote checkout and byte/dependency verification; no independent rebuild claimed.",
"passResult": true,
"releaseTag": "v1.8.4-refined-neon-20261104",
"releaseTagCommit": "fe7ddbd6f89b4ee3c7af9dd61e94d99056f414e8",
"trackedFilesVerified": 485,
"dependencyArchivesVerified": [
"OpenColorIO-2.5.2.tar.gz",
"expat-2.7.2.tar.gz",
"yaml-cpp-0.8.0.tar.gz",
"Imath-3.2.1.tar.gz",
"pystring-1.1.4.tar.gz",
"minizip-ng-4.0.10.tar.gz",
"zlib-1.3.1.tar.gz",
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
],
"compiledInputsMatchTag": true,
"releaseTagCheckedOut": true,
"temporaryCloneRemoved": true
}
@@ -0,0 +1,11 @@
{
"status": "draft-download-required",
"releaseID": 385,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.4-refined-neon-20261104",
"tag": "v1.8.4-refined-neon-20261104",
"commit": "fe7ddbd6f89b4ee3c7af9dd61e94d99056f414e8",
"assetID": 29,
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.4-refined-neon-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.4.pkg",
"bytes": 43009859,
"sha256": "59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660"
}
+13 -13
查看文件
@@ -3,23 +3,23 @@
"repository": "dayu/dayu-color",
"repositoryID": 52,
"private": false,
"tag": "v1.8.3-neon-histogram-20261104",
"releaseCommit": "a06a3a3914efb6970858baa9cfc6bed62549f09e",
"releaseID": 384,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.3-neon-histogram-20261104",
"tag": "v1.8.4-refined-neon-20261104",
"releaseCommit": "fe7ddbd6f89b4ee3c7af9dd61e94d99056f414e8",
"releaseID": 385,
"releaseURL": "https://dayu.media/git/dayu/dayu-color/releases/tag/v1.8.4-refined-neon-20261104",
"prerelease": true,
"assetID": 28,
"assetName": "大鱼调色-1.8.3.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.3-neon-histogram-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.3.pkg",
"bytes": 43010609,
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53",
"assetID": 29,
"assetName": "大鱼调色-1.8.4.pkg",
"downloadURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.4-refined-neon-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.4.pkg",
"bytes": 43009859,
"sha256": "59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660",
"existingAssetReused": true,
"verification": "Full draft download checked before publication; published attachment downloaded and checked again; release, tag and asset read-back verified.",
"credentialSource": "macOS Keychain: dayu-git-api",
"draftBrowserDownload": {
"path": "/Volumes/备份/大鱼调色-1.8.3.pkg",
"sha256": "518f54c12a6680c32be5cb4bd7d01b8a4c49e3d492a0d9d75ac5e46e3345da53",
"bytes": 43010609,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.3-neon-histogram-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.3.pkg"
"path": "/Volumes/备份/大鱼调色-1.8.4.pkg",
"sha256": "59c8cee9282260ad97130b1d3d8dc6b09bdf8e8f82cb6c5937bf54ee5880e660",
"bytes": 43009859,
"sourceURL": "https://dayu.media/git/dayu/dayu-color/releases/download/v1.8.4-refined-neon-20261104/%E5%A4%A7%E9%B1%BC%E8%B0%83%E8%89%B2-1.8.4.pkg"
}
}
+66
查看文件
@@ -0,0 +1,66 @@
{
"package": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.5.pkg",
"sha256": "1cdf42978ebc75e9bd21fb8b83e65c60d935f7434f773e5b4a63c9e72c4d0102",
"bytes": 43012795,
"testUnsigned": false,
"installationExecuted": false,
"checks": [
"PKG Developer ID Installer signature",
"PKG stapled ticket and Gatekeeper install assessment",
"must-close attached to root-authorized payload",
"all four FCP/Motion host identifiers",
"bundle relocation disabled",
"desktop and Bundle ID preinstall guards",
"postinstall contains actual FxPlug verification invocations",
"GUI worker, registration repair and Finder reveal present",
"successful completion and consecutive registration checks",
"exact payload contents: 大鱼调色.app",
"fixed FxPlug outer APP install path",
"outer APP has one real verification action",
"service path/identifier/registration version: com.dayu.color.XPC",
"nonempty FxPlug service manifest",
"payload APP signature, independent ticket and Gatekeeper",
"exact payload contents: 大鱼调色",
"login-user resource destination: ~/Movies/Motion Templates.localized/Effects.localized",
"complete outer APP payload present",
"welcome warns to save work and close hosts",
"conclusion gives manual APP and host restart instructions"
],
"resources": [
{
"source": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"payload": "Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.5",
"build": "66"
},
{
"source": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/pkg-inputs/大鱼调色",
"payload": "Library/Application Support/PKGForge/Payload/com.dayu.color.installer.92d6f922-ffdb-4f8a-a73e-3d8e8627080f/7078D1D0-8100-4D5D-BFFD-729D1B7018EB/大鱼调色"
}
],
"signature": "Package \"大鱼调色-1.8.5.pkg\":\n Status: signed by a developer certificate issued by Apple for distribution\n Notarization: trusted by the Apple notary service\n Signed with a trusted timestamp on: 2026-11-04 06:11:10 +0000\n Certificate Chain:\n 1. Developer ID Installer: zhong luo (B3W25FX5H5)\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n C0 19 01 3C 67 88 8F 34 65 56 C5 91 3C E5 B6 12 4C 5D A6 DA F9 D8 \n DA 00 37 52 DF F0 F3 E6 00 B4\n ------------------------------------------------------------------------\n 2. Developer ID Certification Authority\n Expires: 2027-02-01 22:12:15 +0000\n SHA256 Fingerprint:\n 7A FC 9D 01 A6 2F 03 A2 DE 96 37 93 6D 4A FE 68 09 0D 2D E1 8D 03 \n F2 9C 88 CF B0 B1 BA 63 58 7F\n ------------------------------------------------------------------------\n 3. Apple Root CA\n Expires: 2035-02-09 21:40:36 +0000\n SHA256 Fingerprint:\n B0 B1 73 0E CB C7 FF 45 05 14 2C 49 F1 29 5E 6E DA 6B CA ED 7E 2C \n 68 C5 BE 91 B5 A1 10 01 F0 24",
"gatekeeper": "/Volumes/备份/大鱼调色/发行包/大鱼调色-1.8.5.pkg: accepted\nsource=Notarized Developer ID",
"pass": true,
"scope": "Expanded package structural and payload verification only; no installer scripts executed and no host quit or registration performed.",
"notarization": {
"message": "Successfully received submission info",
"id": "4c69bfb8-4f9e-4c66-9a9e-d370d60e1dd5",
"status": "Accepted",
"createdDate": "2026-11-04T06:11:11.647Z",
"name": "大鱼调色-1.8.5.pkg"
},
"appCompiledSource": "07a3f7bd4d32a544c9d045768d93ebfd30e8a48d",
"appBuild": "66",
"packageBuilderRemote": "https://dayu.media/git/dayu/pkg-forge.git",
"packageBuilderCommit": "eb53707c0e67d8ddeab8c1270bb079f1050cfafe",
"templateSHA256": {
"大鱼调色.moef": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"large.png": "ab12611e8801cff86332ccc505a4cffa0c1120541c2efb9bb9908be2c9fe631a",
"small.png": "41fec3138aee904fc39d6982e6fde809243ffec55298dbfe966f4f48d89caf8a"
},
"installedAppHostAcceptance": "verification/HostDualSoft1.8.5.json",
"installScope": "本轮仅生成并验包,未再次执行系统安装;正式 APP 已有独立宿主验收。",
"supersededBeforeRelease": true,
"supersededPackageHeldAt": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/superseded-1.8.5-66.pkg"
}
+16
查看文件
@@ -0,0 +1,16 @@
{
"status": "verified",
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
"bundleID": "com.dayu.color",
"version": "1.8.5",
"build": "65",
"team": "B3W25FX5H5",
"notaryID": "41523305-5eb7-4f24-b4d9-b39044c48387",
"notaryStatus": "Accepted",
"gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID",
"sourceCommit": "09e04ca6475cae87cc773eb33c983456d6099dd8",
"templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef",
"templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891",
"shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76",
"hostVerification": "verification/HostSoft1.8.5.json"
}
文件差异过大,未显示。 加载差异
+19
查看文件
@@ -0,0 +1,19 @@
{
"remote": "https://dayu.media/git/dayu/dayu-color.git",
"clone": "/Users/mac/Library/Caches/CodexBuilds/com.dayu.color/restore-soft-anic10xc",
"compiledSource": "d39004c26af3c0c5853111faef7e40e6c66f6aa6",
"gitFsck": "full strict passed",
"scope": "Independent remote checkout and byte/dependency verification; no independent rebuild claimed.",
"passResult": true,
"lightCandidateCompiledSource": "09e04ca6475cae87cc773eb33c983456d6099dd8",
"dependencyArchivesVerified": [
"OpenColorIO-2.5.2.tar.gz",
"expat-2.7.2.tar.gz",
"yaml-cpp-0.8.0.tar.gz",
"Imath-3.2.1.tar.gz",
"pystring-1.1.4.tar.gz",
"minizip-ng-4.0.10.tar.gz",
"zlib-1.3.1.tar.gz",
"sse2neon-227cc413fb2d50b2a10073087be96b59d5364aea.tar.gz"
]
}
@@ -15,24 +15,37 @@
for(NSNumber *width in @[@280,@320,@400]){
[view setFrameSize:NSMakeSize(width.doubleValue,780)];[view layoutSubtreeIfNeeded];NSArray *buttons=@[[view valueForKey:@"save"],[view valueForKey:@"load"],[view valueForKey:@"export"],settings];BOOL fit=YES;
for(NSView *button in buttons){fit&=NSMinX(button.frame)>=0&&NSMaxX(button.frame)<=width.doubleValue&&button.frame.size.width>=66;for(NSView *other in buttons)if(button!=other)fit&=!NSIntersectsRect(button.frame,other.frame);}
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==7&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
NSArray *themes=[view valueForKey:@"themeButtons"];NSView *brand=[view valueForKey:@"brand"];fit&=themes.count==2&&NSMaxX(brand.frame)<=NSMinX([themes.firstObject frame]);
for(NSButton *mode in themes){fit&=mode.frame.size.width>=44&&NSMaxX(mode.frame)<=NSMinX([[view valueForKey:@"resetAll"]frame])&&mode.title.length>0;for(NSButton *other in themes)if(mode!=other)fit&=!NSIntersectsRect(mode.frame,other.frame);}
run.record([NSString stringWithFormat:@"compact-header-controls-fit-%@",width],fit);
}
DYDiagnosticManager *fresh=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(fresh,nil);run.record(@"compact-new-host-stays-original-flow",!DYReadAssets(fresh,kCMTimeZero).colorManagement);
NSInteger previous=DYThemeIndex();@try{
BOOL colors=DYThemeNames().count==7&&[DYThemeNames()[5]isEqual:@"黑金渐变"];
for(NSInteger i=0;i<7;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
run.record(@"compact-six-stable-theme-choices",colors);
DYSetThemeIndex(5);auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);};
double minimum=100;for(NSString *text in @[@"text",@"secondary"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop"])minimum=std::min(minimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
run.record(@"compact-gold-labels-have-readable-contrast",minimum>=4.5,@{@"minimumContrast":@(minimum)});
BOOL colors=DYThemeNames().count==2&&[DYThemeNames()[0]isEqual:@"浅色"]&&[DYThemeNames()[1]isEqual:@"深色"];
for(NSInteger i=7;i<=8;i++){DYSetThemeIndex(i);colors&=DYThemeIndex()==i&&DYThemePalette()[@"background"]&&DYThemePalette()[@"text"];}
run.record(@"compact-only-light-dark-choices",colors);
auto luminance=[](NSColor *color){NSColor *c=[color colorUsingColorSpace:NSColorSpace.sRGBColorSpace];auto linear=[](double x){return x<=.04045?x/12.92:pow((x+.055)/1.055,2.4);};return .2126*linear(c.redComponent)+.7152*linear(c.greenComponent)+.0722*linear(c.blueComponent);};
NSDictionary *themeSnapshot=[view presetSnapshot];int themeUndo=host->_undoStarts;
DYSetThemeIndex(7);double lightMinimum=100;
for(NSString *text in @[@"text",@"secondary",@"slot15",@"accent"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop",@"headerBottom"])
lightMinimum=std::min(lightMinimum,(luminance(DYThemePalette()[surface])+.05)/(luminance(DYThemePalette()[text])+.05));
run.record(@"soft-light-text-contrast-at-least-4.5",lightMinimum>=4.5,@{@"minimumContrast":@(lightMinimum)});
[view performSelector:@selector(themeChanged:) withObject:nil];
run.record(@"soft-native-controls-use-light-appearance",[view.appearance.name isEqual:NSAppearanceNameAqua]&&DYThemeTextShadow()==nil);
run.record(@"soft-theme-preserves-grade-and-undo",[themeSnapshot isEqual:[view presetSnapshot]]&&themeUndo==host->_undoStarts);
DYSetThemeIndex(8);double darkMinimum=100;
for(NSString *text in @[@"text",@"secondary",@"slot15",@"accent"])for(NSString *surface in @[@"background",@"backgroundEnd",@"card",@"cardEnd",@"field",@"headerTop",@"headerBottom"])
darkMinimum=std::min(darkMinimum,(luminance(DYThemePalette()[text])+.05)/(luminance(DYThemePalette()[surface])+.05));
run.record(@"soft-dark-text-contrast-at-least-4.5",darkMinimum>=4.5,@{@"minimumContrast":@(darkMinimum)});
[view performSelector:@selector(themeChanged:) withObject:nil];
run.record(@"soft-dark-native-appearance-without-text-glow",[view.appearance.name isEqual:NSAppearanceNameDarkAqua]&&DYThemeTextShadow()==nil);
run.record(@"soft-dark-theme-preserves-grade-and-undo",[themeSnapshot isEqual:[view presetSnapshot]]&&themeUndo==host->_undoStarts);
DYSetThemeIndex(6);run.record(@"compact-removed-themes-cannot-be-selected",DYThemeIndex()==8);
DYThemePopUpButton *pullDown=[[[DYThemePopUpButton alloc]initWithFrame:NSMakeRect(0,0,240,28) pullsDown:YES]autorelease];[pullDown addItemWithTitle:@"+ 添加模块"];pullDown.font=[NSFont systemFontOfSize:11];
NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:240 pixelsHigh:28 bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:0 bitsPerPixel:0]autorelease];
[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];[pullDown drawRect:pullDown.bounds];[NSGraphicsContext restoreGraphicsState];NSUInteger glyphPixels=0;
for(int y=6;y<23;y++)for(int x=9;x<90;x++){NSColor *c=[bitmap colorAtX:x y:y];if(c.redComponent>.55&&c.greenComponent>.35)glyphPixels++;}
run.record(@"compact-gold-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)});
BOOL reduced=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
run.record(@"compact-gold-glow-respects-system-display-options",reduced?DYThemeTextShadow()==nil:DYThemeTextShadow().shadowBlurRadius<=2);
run.record(@"compact-dark-pull-down-draws-readable-caption",glyphPixels>30,@{@"brightCaptionPixels":@(glyphPixels)});
}@finally{DYSetThemeIndex(previous);}
}
// Histogram math is independent of UI palettes and never edits a host document.
@@ -61,7 +74,7 @@
run.record(@"histogram-channel-and-overlay-presentation-does-not-edit-grade",[before isEqual:[view presetSnapshot]]&&host->_undoStarts==0&&host->_undoEnds==0);
[renderer invalidatePreview];[view performSelector:@selector(previewChanged:) withObject:nil];
run.record(@"histogram-invalidation-clears-view-and-renderer",![renderer histogram]&&![graph valueForKey:@"histogram"]);
NSInteger previous=DYThemeIndex();DYSetThemeIndex(6);
run.record(@"neon-stable-theme-id-and-no-text-glow",[DYThemeNames()[6]isEqual:@"霓虹炫彩"]&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
NSInteger previous=DYThemeIndex();DYSetThemeIndex(8);
run.record(@"relief-only-two-choices-and-no-text-glow",DYThemeNames().count==2&&DYThemeTextShadow()==nil&&![DYThemePalette()[@"background"]isEqual:DYThemePalette()[@"backgroundEnd"]]);
DYSetThemeIndex(previous);
}
+22 -26
查看文件
@@ -84,13 +84,15 @@ 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(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];[[NSColor colorWithWhite:0 alpha:.28]setStroke];bar.lineWidth=.6;[bar stroke];
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];
double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue);
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:DYThemeIndex()==6?0:90];
NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:active xRadius:2 yRadius:2] angle:0];
}
- (void)drawKnob:(NSRect)knobRect {
NSRect circle=NSInsetRect(knobRect,1,1);
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];
}
@@ -100,7 +102,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];
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];
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];
}
@end
@@ -162,9 +165,9 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
@implementation DYCard
- (void)drawRect:(NSRect)rect {
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,.5,.5) xRadius:11 yRadius:11];
DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];
path.lineWidth=1; [path stroke];
[[NSColor colorWithWhite:.52 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(self.bounds,3,3),12,NO,NO,NO);
else{DYDrawThemeSurface(path,YES);[DYThemeColor(@"border")setStroke];path.lineWidth=1;[path stroke];}
[(DYThemeIsLight()?DYThemeColor(@"secondary"):[NSColor colorWithWhite:.52 alpha:1])setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(32,19,5,5)]fill];
}
@end
@@ -175,15 +178,7 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
- (void)drawRect:(NSRect)dirtyRect {
NSRect r=NSInsetRect(self.bounds,.5,2);
NSBezierPath *pill=[NSBezierPath bezierPathWithRoundedRect:r xRadius:7 yRadius:7];
if(DYThemeIndex()==6){
NSDictionary *palette=DYThemePalette();BOOL expanded=self.state==NSControlStateValueOn;
NSColor *left=[palette[@"headerTop"]blendedColorWithFraction:expanded?.32:.22 ofColor:palette[@"activeTop"]];
NSColor *right=[palette[@"headerBottom"]blendedColorWithFraction:expanded?.26:.18 ofColor:palette[@"activeBottom"]];
NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:left endingColor:right]autorelease];[gradient drawInBezierPath:pill angle:0];
[[NSColor colorWithCalibratedRed:.72 green:.67 blue:.88 alpha:expanded?.65:.40]setStroke];pill.lineWidth=1;[pill stroke];
}else{
NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"headerTop"] endingColor:DYThemePalette()[@"headerBottom"]]autorelease];[g drawInBezierPath:pill angle:90];
}
BOOL expanded=self.state==NSControlStateValueOn;DYDrawSoftControl(NSInsetRect(self.bounds,2,3),7,expanded,NO,self.cell.highlighted);
NSDictionary *attributes=DYThemeTextAttributes(self.font,DYInk());
[(self.state==NSControlStateValueOn?@"▾":@"▸") drawInRect:NSMakeRect(8,7,12,16) withAttributes:attributes];
[self.title drawInRect:NSMakeRect(23,7,MAX(0,r.size.width-31),16) withAttributes:attributes];
@@ -201,7 +196,6 @@ static NSArray *DYAccessibleSubviews(NSView *view, BOOL visibleOnly) {
- (void)dealloc {[_swatch release];[super dealloc];}
- (void)drawRect:(NSRect)dirtyRect {
NSRect r=NSInsetRect(self.bounds,3,3);[_swatch setFill];NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:r xRadius:5 yRadius:5];[p fill];
if([self.identifier isEqual:@"themeSwatch"]&&self.tag>=5){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:self.tag==6?[NSColor colorWithSRGBRed:.8 green:.12 blue:1 alpha:1]:NSColor.blackColor endingColor:self.tag==6?NSColor.cyanColor:DYThemeSwatch(5)]autorelease];[g drawInBezierPath:p angle:45];}
if([self.identifier isEqual:@"customColorSwatch"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[NSColor.systemRedColor,NSColor.systemYellowColor,NSColor.systemGreenColor,NSColor.systemCyanColor,NSColor.systemBlueColor,NSColor.systemPurpleColor]]autorelease];[g drawInBezierPath:p angle:45];[@"⌾" drawInRect:NSInsetRect(r,3,1) withAttributes:@{NSFontAttributeName:[NSFont boldSystemFontOfSize:16],NSForegroundColorAttributeName:NSColor.whiteColor}];}
if(self.state==NSControlStateValueOn){[DYInk() setStroke];p.lineWidth=2;[p stroke];}
}
@@ -297,12 +291,12 @@ static NSArray *DYPresentationSections(void) {
}
- (void)drawRect:(NSRect)dirtyRect {
NSRect r=[self plotRect];
[(DYThemeIndex()==6?[NSColor colorWithSRGBRed:.025 green:.02 blue:.06 alpha:1]:DYThemeIndex()==5?DYThemeColor(@"card"):[NSColor colorWithSRGBRed:.025 green:.085 blue:.13 alpha:1]) setFill];[[NSBezierPath bezierPathWithRoundedRect:r xRadius:4 yRadius:4] fill];
DYDrawSoftControl(r,5,YES,NO,NO);
if(_histogramToggle.state==NSControlStateValueOn){
const DYHistogram *h=_histogram.length==sizeof(DYHistogram)?(const DYHistogram*)_histogram.bytes:nullptr;
if(h&&h->samples){
uint32_t peak=1;for(int c=0;c<4;c++)if(_channel==0||c==_channel)for(int b=0;b<256;b++)peak=MAX(peak,h->bins[c][b]);
NSArray *colors=@[NSColor.whiteColor,[NSColor colorWithSRGBRed:1 green:.23 blue:.37 alpha:1],[NSColor colorWithSRGBRed:.23 green:.94 blue:.50 alpha:1],[NSColor colorWithSRGBRed:.19 green:.51 blue:1 alpha:1]];
NSArray *colors=DYThemeIsLight()?@[DYInk(),[NSColor colorWithSRGBRed:.78 green:.20 blue:.32 alpha:1],[NSColor colorWithSRGBRed:.13 green:.50 blue:.31 alpha:1],[NSColor colorWithSRGBRed:.18 green:.39 blue:.83 alpha:1]]:@[NSColor.whiteColor,[NSColor colorWithSRGBRed:1 green:.23 blue:.37 alpha:1],[NSColor colorWithSRGBRed:.23 green:.94 blue:.50 alpha:1],[NSColor colorWithSRGBRed:.19 green:.51 blue:1 alpha:1]];
[NSGraphicsContext saveGraphicsState];NSRectClip(r);
for(int c=3;c>=0;c--){if(_channel!=0&&c!=_channel)continue;
NSBezierPath *area=[NSBezierPath bezierPath],*line=[NSBezierPath bezierPath];[area moveToPoint:NSMakePoint(NSMinX(r),NSMaxY(r))];
@@ -311,7 +305,7 @@ static NSArray *DYPresentationSections(void) {
}[NSGraphicsContext restoreGraphicsState];
}else [@"等待画面 · 请移动播放头" drawAtPoint:NSMakePoint(r.origin.x+8,NSMaxY(r)-20) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
}
[[NSColor colorWithWhite:1 alpha:.1] setStroke];NSBezierPath *grid=[NSBezierPath bezierPath];grid.lineWidth=.5;
[[(DYThemeIsLight()?DYInk():NSColor.whiteColor) colorWithAlphaComponent:DYThemeIsLight()?.18:.1] setStroke];NSBezierPath *grid=[NSBezierPath bezierPath];grid.lineWidth=.5;
for(int i=0;i<5;i++){CGFloat x=r.origin.x+r.size.width*i/4,y=r.origin.y+r.size.height*i/4;[grid moveToPoint:NSMakePoint(x,NSMinY(r))];[grid lineToPoint:NSMakePoint(x,NSMaxY(r))];[grid moveToPoint:NSMakePoint(NSMinX(r),y)];[grid lineToPoint:NSMakePoint(NSMaxX(r),y)];}[grid stroke];
std::vector<NSPoint> p; p.push_back(NSMakePoint(0,0));
NSArray *points=[self activePoints];for(NSDictionary *point in points)p.push_back(NSMakePoint([point[@"x"] doubleValue],[point[@"y"] doubleValue]));p.push_back(NSMakePoint(1,1));
@@ -334,11 +328,11 @@ static NSArray *DYPresentationSections(void) {
NSPoint q=NSMakePoint(r.origin.x+x*r.size.width,r.origin.y+(1-fmax(0,fmin(1,y)))*r.size.height);
if(sample==0)[curve moveToPoint:q];else[curve lineToPoint:q];
}
NSColor *color=_channel==0?(DYThemeIndex()==6?NSColor.whiteColor:DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
NSColor *color=_channel==0?(DYThemeIsLight()?DYInk():DYAccent()):_channel==1?[NSColor systemRedColor]:_channel==2?[NSColor systemGreenColor]:[NSColor systemBlueColor];[color setStroke];[curve stroke];
for(NSDictionary *point in points) {NSPoint q=[self positionOfPoint:point];[color setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] fill];[DYInk() setStroke];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(q.x-4,q.y-4,8,8)] stroke];}
NSDictionary *axis=@{NSFontAttributeName:[NSFont monospacedDigitSystemFontOfSize:8 weight:NSFontWeightRegular],NSForegroundColorAttributeName:DYThemeColor(@"secondary")};
[@"0" drawAtPoint:NSMakePoint(NSMinX(r),NSMaxY(r)+2) withAttributes:axis];[@"128" drawAtPoint:NSMakePoint(NSMidX(r)-7,NSMaxY(r)+2) withAttributes:axis];[@"255" drawAtPoint:NSMakePoint(NSMaxX(r)-14,NSMaxY(r)+2) withAttributes:axis];
[@"点击添加 · 拖动调整 · 双击删除" drawAtPoint:NSMakePoint(16,self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:9],NSForegroundColorAttributeName:[NSColor colorWithWhite:.7 alpha:1]}];
[@"点击添加 · 拖动调整 · 双击删除" drawAtPoint:NSMakePoint(16,self.bounds.size.height-16) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:9],NSForegroundColorAttributeName:DYThemeColor(@"secondary")}];
}
- (void)sendValues:(NSDictionary *)values {
NSMutableDictionary *merged=[[_values mutableCopy] autorelease];[merged addEntriesFromDictionary:values];[self setValues:merged];
@@ -496,7 +490,7 @@ static NSImage *DYWheelImage(void) {
self.clipsToBounds=YES;
self.wantsLayer=YES; self.layer.masksToBounds=YES;
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
self.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
self.appearance=[NSAppearance appearanceNamed:DYThemeIsLight()?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
_brand=[DYLabel(@"◒ 大鱼调色",16) retain]; _brand.font=[NSFont boldSystemFontOfSize:16];_brand.textColor=DYInk();
_subtitle=[DYLabel([[NSBundle bundleForClass:self.class]objectForInfoDictionaryKey:@"CFBundleShortVersionString"]?:@"1.1.5",9) retain]; _subtitle.textColor=DYThemeColor(@"secondary");
_websiteLink=[[DYWebsiteLink alloc]initWithFrame:NSZeroRect];_websiteLink.title=@"更多插件访问 https://dayu.media";
@@ -512,7 +506,7 @@ static NSImage *DYWheelImage(void) {
for(NSDictionary *section in DYPresentationSections()){NSMenuItem *item=[[[NSMenuItem alloc]initWithTitle:section[@"title"] action:@selector(addModule:) keyEquivalent:@""]autorelease];item.target=self;item.representedObject=section[@"key"];[_addModule.menu addItem:item];}
for(NSView *v in @[_brand,_subtitle,_websiteLink,_resetAll,_save,_load,_export,_colorSettings,_addModule]){[self addSubview:v];v.hidden=_embedded;}
NSMutableArray *themes=[NSMutableArray array];for(NSInteger i=0;i<DYThemeNames().count;i++){
DYSwatchButton *b=[[[DYSwatchButton alloc]initWithFrame:NSZeroRect]autorelease];[b setButtonType:NSButtonTypePushOnPushOff];b.swatch=DYThemeSwatch(i);b.tag=i;b.identifier=@"themeSwatch";b.target=self;b.action=@selector(selectTheme:);b.title=@"";b.bordered=NO;
NSButton *b=DYButton(DYThemeNames()[i],self,@selector(selectTheme:));[b setButtonType:NSButtonTypePushOnPushOff];b.tag=i+7;b.identifier=@"appearanceToggle";
b.toolTip=[DYThemeNames()[i] stringByAppendingString:@"主题"];b.accessibilityLabel=b.toolTip;[self addSubview:b];b.hidden=_embedded;[themes addObject:b];
}_themeButtons=[themes copy];
_scroll=[[DYInspectorScrollView alloc] initWithFrame:NSZeroRect];
@@ -549,7 +543,8 @@ static NSImage *DYWheelImage(void) {
[super dealloc];
}
- (BOOL)isFlipped { return YES; }
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);if(DYThemeIndex()==6&&![self.identifier isEqual:@"inspectorBackground"]){NSGradient *g=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"activeTop"] endingColor:DYThemePalette()[@"activeBottom"]]autorelease];[g drawInRect:NSMakeRect(0,0,self.bounds.size.width,2) angle:0];}}
- (void)drawRect:(NSRect)rect {DYDrawThemeSurface([NSBezierPath bezierPathWithRect:self.bounds],NO);}
- (BOOL)isAccessibilityElement { return YES; }
- (NSAccessibilityRole)accessibilityRole { return NSAccessibilityGroupRole; }
- (NSArray *)accessibilityChildren { return DYAccessibleSubviews(self,NO); }
@@ -577,7 +572,8 @@ static NSImage *DYWheelImage(void) {
- (void)openWebsite:(id)sender {[[NSWorkspace sharedWorkspace]openURL:[NSURL URLWithString:@"https://dayu.media"]];}
- (void)redrawTree:(NSView *)view { [view setNeedsDisplay:YES];for(NSView *child in view.subviews)[self redrawTree:child]; }
- (void)themeChanged:(NSNotification *)notification {
for(NSDictionary *card in _cards){NSColor *accent=DYThemeIndex()==6?DYThemeColor(@"slot15"):DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
self.appearance=[NSAppearance appearanceNamed:DYThemeIsLight()?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
for(NSDictionary *card in _cards){NSColor *accent=DYAccent();for(NSString *key in @[@"enabled",@"maskButton",@"repeatButton",@"removeButton"])[card[key]setContentTintColor:accent];}
self.layer.backgroundColor=[DYThemePalette()[@"background"] CGColor];
for(NSButton *b in _themeButtons)b.state=b.tag==DYThemeIndex()?NSControlStateValueOn:NSControlStateValueOff;
_websiteLink.attributedTitle=[[[NSAttributedString alloc]initWithString:_websiteLink.title attributes:DYThemeTextAttributes(_websiteLink.font,DYAccent())]autorelease];
@@ -752,7 +748,7 @@ static NSImage *DYWheelImage(void) {
[super layout];
CGFloat w=MAX(280,self.bounds.size.width),h=self.bounds.size.height;
_brand.frame=NSMakeRect(16,14,112,26);_subtitle.frame=NSMakeRect(130,21,40,13);_subtitle.hidden=_embedded||w<380;
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-147+i*16,17,16,22)];
for(NSInteger i=0;i<_themeButtons.count;i++)[_themeButtons[i]setFrame:NSMakeRect(w-130+i*47,16,44,25)];
_resetAll.frame=NSMakeRect(w-33,16,23,24);
_websiteLink.frame=NSMakeRect(16,41,w-32,20);
CGFloat gap=7;BOOL compact=w<320;CGFloat bw=(w-32-gap*(compact?1:3))/(compact?2:4);
+5 -3
查看文件
@@ -400,10 +400,12 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
- (void)updatePalette:(NSDictionary *)palette{
NSMutableDictionary *browserPalette=[NSMutableDictionary dictionaryWithDictionary:palette?:@{}];
browserPalette[@"background"]=[NSColor colorWithCalibratedRed:.035 green:.08 blue:.12 alpha:1];
NSColor *background=[palette[@"background"]colorUsingColorSpace:NSColorSpace.sRGBColorSpace];
BOOL light=background&&background.redComponent>.7&&background.greenComponent>.7;
// Keep the supplied neutral surface in both relief themes.
[_palette release];_palette=[browserPalette copy];_root.palette=_palette;_folderDocument.palette=_palette;_gridDocument.palette=_palette;
self.window.backgroundColor=DYBrowserColor(_palette,@"background");self.window.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
_root.appearance=[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua];
self.window.backgroundColor=DYBrowserColor(_palette,@"background");self.window.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
_root.appearance=[NSAppearance appearanceNamed:light?NSAppearanceNameAqua:NSAppearanceNameDarkAqua];
for(NSTextField *label in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_emptyLabel])label.textColor=DYBrowserColor(_palette,label==_titleLabel?@"text":@"secondary");
for(NSButton *button in @[_importFiles,_importFolder,_reveal,_refresh,_none,_done,_layoutMenu])button.contentTintColor=DYBrowserColor(_palette,@"accent");
_search.textColor=DYBrowserColor(_palette,@"text");_search.backgroundColor=DYBrowserColor(_palette,@"field");
+4 -1
查看文件
@@ -6,7 +6,10 @@ FOUNDATION_EXPORT NSInteger DYThemeIndex(void);
FOUNDATION_EXPORT void DYSetThemeIndex(NSInteger index);
FOUNDATION_EXPORT NSDictionary<NSString *, NSColor *> *DYThemePalette(void);
FOUNDATION_EXPORT NSColor *DYThemeColor(NSString *role);
FOUNDATION_EXPORT NSColor *DYThemeSwatch(NSInteger index);
FOUNDATION_EXPORT BOOL DYThemeIsLight(void);
FOUNDATION_EXPORT BOOL DYThemeUsesRelief(void);
// Opaque relief with a directional reflective rim; native controls retain their actions.
FOUNDATION_EXPORT void DYDrawSoftControl(NSRect rect, CGFloat radius, BOOL recessed, BOOL emphasized, BOOL pressed);
// Shared AppKit controls keep native actions, focus, and accessibility.
FOUNDATION_EXPORT NSShadow *DYThemeTextShadow(void);
+81 -43
查看文件
@@ -11,7 +11,7 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
- (instancetype)init {
if((self=[super init])) {
_defaults=[[NSUserDefaults alloc]initWithSuiteName:preferenceDomain];
[_defaults registerDefaults:@{@"themeIndex":@6}];
[_defaults registerDefaults:@{@"themeIndex":@7}];
[[NSDistributedNotificationCenter defaultCenter]addObserver:self selector:@selector(externalChange:) name:distributedChange object:preferenceDomain suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
}
return self;
@@ -23,80 +23,118 @@ static NSColor *rgb(double r,double g,double b){return [NSColor colorWithCalibra
}
@end
static DYThemeStore *store(void){static DYThemeStore *s;static dispatch_once_t once;dispatch_once(&once,^{s=[DYThemeStore new];});return s;}
NSArray<NSString *> *DYThemeNames(void){return @[@"深空灰",@"冰川蓝",@"薰衣草紫",@"翡翠绿",@"琥珀橙",@"黑金渐变",@"霓虹炫彩"];}
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i>=0&&i<7?i:6;}
static const double paletteRGB[7][17][3]={
{{0.11,0.12,0.14},{0.075,0.08,0.095},{0.17,0.18,0.21},{0.12,0.13,0.15},{0.27,0.29,0.33},{0.2,0.22,0.25},{0.36,0.39,0.44},{0.25,0.28,0.32},{0.21,0.23,0.26},{0.15,0.17,0.2},{0.78,0.83,0.9},{0.55,0.61,0.7},{1.0,1.0,1.0},{0.78,0.82,0.88},{0.96,0.97,0.98},{0.86,0.89,0.92},{0.67,0.72,0.77}},
{{0.031,0.086,0.148},{0.025,0.075,0.13},{0.07,0.155,0.235},{0.045,0.12,0.19},{0.115,0.22,0.33},{0.07,0.15,0.24},{0.15,0.33,0.5},{0.08,0.24,0.36},{0.23,0.32,0.41},{0.18,0.26,0.35},{0.38,0.76,1.0},{0.23,0.64,0.97},{0.96,0.98,1.0},{0.62,0.7,0.76},{0.88,0.96,1.0},{0.82,0.9,0.96},{0.58,0.7,0.78}},
{{0.11,0.09,0.17},{0.07,0.06,0.12},{0.18,0.14,0.28},{0.13,0.1,0.21},{0.27,0.22,0.42},{0.2,0.16,0.31},{0.43,0.34,0.68},{0.31,0.23,0.52},{0.22,0.18,0.31},{0.15,0.12,0.23},{0.78,0.71,1.0},{0.5,0.42,0.93},{0.95,0.9,1.0},{0.63,0.5,0.95},{0.98,0.95,1.0},{0.9,0.86,0.97},{0.7,0.66,0.82}},
{{0.08,0.17,0.1},{0.05,0.12,0.07},{0.12,0.27,0.15},{0.09,0.2,0.11},{0.16,0.35,0.2},{0.12,0.27,0.15},{0.21,0.57,0.31},{0.14,0.4,0.21},{0.14,0.27,0.16},{0.1,0.2,0.11},{0.54,0.96,0.64},{0.22,0.75,0.35},{0.91,1.0,0.93},{0.28,0.8,0.42},{0.95,1.0,0.96},{0.86,0.96,0.88},{0.66,0.8,0.68}},
{{0.23,0.15,0.08},{0.16,0.1,0.05},{0.35,0.22,0.11},{0.26,0.16,0.08},{0.45,0.28,0.14},{0.36,0.22,0.1},{0.72,0.44,0.18},{0.56,0.32,0.12},{0.29,0.18,0.09},{0.2,0.12,0.06},{0.98,0.67,0.31},{0.86,0.47,0.17},{1.0,0.86,0.57},{0.93,0.59,0.22},{1.0,0.96,0.9},{0.97,0.9,0.82},{0.8,0.7,0.58}},
{{.065,.060,.050},{.012,.012,.012},{.12,.105,.075},{.045,.042,.035},{.105,.092,.065},{.15,.125,.075},{.17,.14,.085},{.075,.065,.045},{.23,.20,.14},{.10,.09,.065},{.98,.82,.42},{.72,.51,.18},{1,.90,.65},{.88,.74,.43},{1,.86,.48},{.96,.82,.49},{.79,.70,.48}},
{{.11,.10,.13},{.045,.040,.055},{.16,.14,.20},{.083,.073,.103},{.115,.104,.139},{.15,.135,.18},{.16,.145,.19},{.105,.10,.13},{.24,.22,.28},{.14,.125,.17},{.90,.20,.83},{.02,.79,.94},{.93,.97,1},{.75,.72,.82},{.95,.97,1},{.86,.86,.91},{.67,.64,.73}}
// Appearance IDs 7/8 preserve the approved light/dark preferences. Legacy
// colorful IDs are intentionally unavailable and fall back to dark on read.
NSArray<NSString *> *DYThemeNames(void){return @[@"浅色",@"深色"];}
NSInteger DYThemeIndex(void){NSInteger i=[store().defaults integerForKey:@"themeIndex"];return i==7||i==8?i:8;}
void DYSetThemeIndex(NSInteger index){if(index!=7&&index!=8)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
static const double paletteRGB[2][17][3]={
{{.89,.94,.97},{.84,.91,.95},{.94,.98,1},{.90,.95,.98},{.83,.90,.95},{.91,.96,.99},{.95,.985,1},{.83,.91,.96},{.74,.84,.90},{.88,.94,.97},{.52,.61,.89},{.29,.74,.80},{.96,.99,1},{.40,.55,.65},{.12,.28,.34},{.17,.32,.39},{.20,.33,.41}},
{{.10,.105,.12},{.055,.056,.065},{.17,.18,.20},{.115,.119,.135},{.065,.073,.09},{.13,.14,.16},{.18,.19,.22},{.105,.11,.13},{.25,.27,.31},{.10,.11,.13},{.62,.55,.91},{.25,.75,.82},{.88,.94,.98},{.55,.64,.72},{.94,.96,.99},{.85,.89,.94},{.65,.70,.77}}
};
NSColor *DYThemeSwatch(NSInteger index){static const double values[7][3]={{.30,.33,.38},{.28,.72,1},{.58,.52,1},{.30,.86,.52},{1,.61,.28},{.96,.77,.36},{.65,.38,1}};index=MAX(0,MIN(6,index));return rgb(values[index][0],values[index][1],values[index][2]);}
void DYSetThemeIndex(NSInteger index){if(index<0||index>6)return;[store().defaults setInteger:index forKey:@"themeIndex"];[store().defaults synchronize];[[NSNotificationCenter defaultCenter]postNotificationName:DYThemeDidChange object:nil];[[NSDistributedNotificationCenter defaultCenter]postNotificationName:distributedChange object:preferenceDomain userInfo:nil deliverImmediately:YES];}
NSDictionary<NSString *,NSColor *> *DYThemePalette(void){
static NSArray *palettes;static dispatch_once_t once;dispatch_once(&once,^{
NSMutableArray *all=[NSMutableArray array];
for(NSInteger index=0;index<7;index++){
for(NSInteger index=0;index<2;index++){
const double (*p)[3]=paletteRGB[index];NSMutableDictionary *d=[NSMutableDictionary dictionary];
for(int i=0;i<17;i++)d[[NSString stringWithFormat:@"slot%d",i]]=rgb(p[i][0],p[i][1],p[i][2]);
NSColor *accent=index==0?rgb(.72,.77,.84):index==1?rgb(.22,.67,1):index==6?rgb(.78,.75,.87):DYThemeSwatch(index);
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"border":[accent colorWithAlphaComponent:.38],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];d[@"backgroundEnd"]=index==5?rgb(.085,.078,.060):d[@"background"];d[@"cardEnd"]=index==5?rgb(.085,.075,.052):d[@"card"];if(index==6){d[@"backgroundEnd"]=rgb(.065,.060,.080);d[@"cardEnd"]=rgb(.093,.090,.110);d[@"border"]=[rgb(.36,.33,.43)colorWithAlphaComponent:.40];} [all addObject:[[d copy]autorelease]];
NSColor *accent=index==0?rgb(.20,.35,.44):rgb(.62,.80,.88);
[d addEntriesFromDictionary:@{@"background":d[@"slot1"],@"card":d[@"slot3"],@"text":d[@"slot14"],@"secondary":d[@"slot16"],@"accent":accent,@"field":d[@"slot4"],@"headerTop":d[@"slot6"],@"headerBottom":d[@"slot7"],@"track":d[@"slot8"],@"activeTop":d[@"slot10"],@"activeBottom":d[@"slot11"],@"knob":d[@"slot12"]}];
d[@"backgroundEnd"]=index==0?rgb(.90,.95,.98):rgb(.085,.09,.10);
d[@"cardEnd"]=index==0?rgb(.86,.93,.97):rgb(.15,.16,.18);
d[@"border"]=index==0?rgb(.55,.70,.79):rgb(.39,.56,.65);
[all addObject:[[d copy]autorelease]];
}palettes=[all copy];
});return palettes[DYThemeIndex()];
});return palettes[DYThemeIndex()==7?0:1];
}
NSColor *DYThemeColor(NSString *role){
static NSDictionary *colors;static dispatch_once_t once;dispatch_once(&once,^{
NSMutableDictionary *all=[NSMutableDictionary dictionary];for(NSString *key in DYThemePalette())all[key]=[NSColor colorWithName:[@"Dayu." stringByAppendingString:key] dynamicProvider:^NSColor *(NSAppearance *appearance){return DYThemePalette()[key];}];colors=[all copy];
});return colors[role]?:NSColor.whiteColor;
}
NSShadow *DYThemeTextShadow(void) {
NSWorkspace *workspace=NSWorkspace.sharedWorkspace;
if(DYThemeIndex()!=5||workspace.accessibilityDisplayShouldIncreaseContrast||workspace.accessibilityDisplayShouldReduceTransparency)return nil;
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[DYThemeColor(@"accent")colorWithAlphaComponent:.30];shadow.shadowBlurRadius=1.8;shadow.shadowOffset=NSZeroSize;return shadow;
}
NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:@{NSFontAttributeName:font,NSForegroundColorAttributeName:color}];
NSShadow *shadow=DYThemeTextShadow();if(shadow)attributes[NSShadowAttributeName]=shadow;return attributes;
}
NSShadow *DYThemeTextShadow(void) {return nil;}
NSDictionary *DYThemeTextAttributes(NSFont *font,NSColor *color) {return @{NSFontAttributeName:font,NSForegroundColorAttributeName:color};}
void DYDrawThemeSurface(NSBezierPath *path,BOOL card) {
NSDictionary *palette=DYThemePalette();NSString *role=card?@"card":@"background";
if(DYThemeIndex()>=5){NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:palette[role] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[gradient drawInBezierPath:path angle:35];}
else {[palette[role]setFill];[path fill];}
NSDictionary *palette=DYThemePalette();NSGradient *g=[[[NSGradient alloc]initWithStartingColor:palette[card?@"card":@"background"] endingColor:palette[card?@"cardEnd":@"backgroundEnd"]]autorelease];[g drawInBezierPath:path angle:35];
}
BOOL DYThemeIsLight(void) {return DYThemeIndex()==7;}
BOOL DYThemeUsesRelief(void) {return DYThemeIndex()==7||DYThemeIndex()==8;}
// Draw the rim as a filled ring, so the highlight follows the entire rounded
// outline rather than glowing around text or requiring additional view layers.
static void softGradient(NSBezierPath *path,NSArray *colors) {
NSRect r=path.bounds;BOOL flipped=NSGraphicsContext.currentContext.isFlipped;
NSGradient *gradient=[[[NSGradient alloc]initWithColors:colors]autorelease];
[NSGraphicsContext saveGraphicsState];[path addClip];
[gradient drawFromPoint:NSMakePoint(NSMinX(r),flipped?NSMinY(r):NSMaxY(r)) toPoint:NSMakePoint(NSMaxX(r),flipped?NSMaxY(r):NSMinY(r)) options:NSGradientDrawsBeforeStartingLocation|NSGradientDrawsAfterEndingLocation];
[NSGraphicsContext restoreGraphicsState];
}
void DYDrawSoftControl(NSRect rect,CGFloat radius,BOOL recessed,BOOL emphasized,BOOL pressed) {
BOOL strong=NSWorkspace.sharedWorkspace.accessibilityDisplayShouldIncreaseContrast;
BOOL quiet=strong||NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceTransparency;
if(DYThemeIndex()==8){
NSBezierPath *shape=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
NSColor *top=recessed||pressed?rgb(.045,.05,.065):rgb(.17,.18,.205);
NSColor *bottom=recessed||pressed?rgb(.095,.11,.13):rgb(.10,.105,.12);
if(emphasized){top=pressed?rgb(.25,.22,.43):rgb(.35,.27,.62);bottom=pressed?rgb(.10,.29,.35):rgb(.12,.40,.48);}
if(!quiet&&!recessed&&!pressed){
[NSGraphicsContext saveGraphicsState];NSShadow *glow=[[[NSShadow alloc]init]autorelease];
glow.shadowColor=[rgb(.36,.72,.83)colorWithAlphaComponent:emphasized?.42:.21];glow.shadowOffset=NSZeroSize;glow.shadowBlurRadius=emphasized?4:3;[glow set];[top setFill];[shape fill];[NSGraphicsContext restoreGraphicsState];
}
softGradient(shape,@[top,bottom]);
NSBezierPath *rim=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];CGFloat width=strong?1.3:1;
[rim appendBezierPath:[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect,width,width) xRadius:MAX(0,radius-width) yRadius:MAX(0,radius-width)]];rim.windingRule=NSWindingRuleEvenOdd;
if(strong){[rgb(.65,.79,.88)setFill];[rim fill];}
else softGradient(rim,recessed||pressed?@[rgb(.15,.22,.29),rgb(.41,.59,.69)]:@[rgb(.70,.82,.91),rgb(.28,.40,.51),rgb(.16,.24,.29),rgb(.38,.53,.61)]);
return;
}
NSBezierPath *shape=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
NSColor *top=recessed||pressed?rgb(.79,.87,.93):rgb(.96,.985,1);
NSColor *bottom=recessed||pressed?rgb(.91,.96,.99):rgb(.85,.92,.97);
if(emphasized){top=pressed?rgb(.66,.73,.90):rgb(.76,.77,.96);bottom=pressed?rgb(.50,.77,.83):rgb(.55,.85,.90);}
if(!quiet&&!recessed&&!pressed){
BOOL flipped=NSGraphicsContext.currentContext.isFlipped;
for(int light=0;light<2;light++){
[NSGraphicsContext saveGraphicsState];NSShadow *shadow=[[[NSShadow alloc]init]autorelease];
shadow.shadowColor=light?[NSColor colorWithWhite:1 alpha:.90]:[rgb(.37,.55,.66)colorWithAlphaComponent:.28];
CGFloat d=light?-1.5:2;shadow.shadowOffset=NSMakeSize(d,flipped?d:-d);shadow.shadowBlurRadius=light?2.5:3.5;[shadow set];[top setFill];[shape fill];[NSGraphicsContext restoreGraphicsState];
}
}
softGradient(shape,@[top,bottom]);
NSBezierPath *rim=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:radius yRadius:radius];
CGFloat width=strong?1.3:1;[rim appendBezierPath:[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect,width,width) xRadius:MAX(0,radius-width) yRadius:MAX(0,radius-width)]];rim.windingRule=NSWindingRuleEvenOdd;
if(strong){[rgb(.33,.49,.60)setFill];[rim fill];}
else softGradient(rim,recessed||pressed?@[rgb(.56,.71,.81),rgb(.98,1,1)]:@[NSColor.whiteColor,rgb(.80,.89,.95),rgb(.55,.72,.83),rgb(.96,.99,1)]);
// The inner hairline gives a visible lower edge even with reduced effects.
NSBezierPath *inner=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(rect,1.5,1.5) xRadius:MAX(0,radius-1.5) yRadius:MAX(0,radius-1.5)];
[[rgb(.40,.60,.73)colorWithAlphaComponent:strong?.35:.12]setStroke];inner.lineWidth=.5;[inner stroke];
}
@implementation DYThemeLabel
- (void)drawRect:(NSRect)rect {[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[super drawRect:rect];[NSGraphicsContext restoreGraphicsState];}
- (void)drawRect:(NSRect)rect {[super drawRect:rect];}
@end
@interface DYThemeButtonCell : NSButtonCell @end
@implementation DYThemeButtonCell
- (NSRect)drawTitle:(NSAttributedString*)title withFrame:(NSRect)frame inView:(NSView*)view {
if(DYThemeIndex()<5)return [super drawTitle:title withFrame:frame inView:view];
NSMutableAttributedString *gold=[[title mutableCopy]autorelease];[gold addAttributes:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,gold.length)];return [super drawTitle:gold withFrame:frame inView:view];
BOOL selected=[view.identifier isEqual:@"appearanceToggle"]&&self.state==NSControlStateValueOn;
NSMutableAttributedString *styled=[[title mutableCopy]autorelease];
NSFont *font=selected?[NSFont boldSystemFontOfSize:11]:(self.font?:[NSFont systemFontOfSize:11]);
[styled addAttributes:DYThemeTextAttributes(font,[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45]) range:NSMakeRange(0,styled.length)];return [super drawTitle:styled withFrame:frame inView:view];
}
- (void)drawBezelWithFrame:(NSRect)frame inView:(NSView*)view {
if(DYThemeIndex()<5||!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(frame,1,2) xRadius:6 yRadius:6];if(DYThemeIndex()==6&&[view.identifier isEqual:@"primaryAction"]){NSGradient *g=[[[NSGradient alloc]initWithColors:@[DYThemePalette()[@"activeTop"],DYThemePalette()[@"activeBottom"]]]autorelease];[g drawInBezierPath:path angle:0];}else DYDrawThemeSurface(path,YES);[[DYThemeColor(@"accent")colorWithAlphaComponent:self.highlighted?.8:.32]setStroke];path.lineWidth=self.highlighted?1.5:1;[path stroke];
if(!self.bordered){[super drawBezelWithFrame:frame inView:view];return;}
BOOL selected=[view.identifier isEqual:@"appearanceToggle"]&&self.state==NSControlStateValueOn;
DYDrawSoftControl(NSInsetRect(frame,2,3),7,selected,[view.identifier isEqual:@"primaryAction"],self.highlighted);
}
@end
@implementation DYThemeButton
+ (Class)cellClass {return DYThemeButtonCell.class;}
- (void)drawRect:(NSRect)rect {
if(DYThemeIndex()==6&&[self.identifier isEqual:@"layerAction"]){
NSBezierPath *plate=[NSBezierPath bezierPathWithRoundedRect:NSInsetRect(self.bounds,1,1) xRadius:5 yRadius:5];
[[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.12:.055]setFill];[plate fill];
[[NSColor colorWithWhite:1 alpha:self.cell.highlighted?.30:.14]setStroke];plate.lineWidth=.7;[plate stroke];
}
if([self.identifier isEqual:@"layerAction"])DYDrawSoftControl(NSInsetRect(self.bounds,2,2),6,NO,NO,self.cell.highlighted);
[super drawRect:rect];
}
@end
@implementation DYThemePopUpButton
- (void)drawRect:(NSRect)rect {
if(DYThemeIndex()<5){[super drawRect:rect];return;}
NSRect bounds=NSInsetRect(self.bounds,1,2);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawThemeSurface(path,YES);
[[DYThemeColor(@"accent")colorWithAlphaComponent:self.enabled?.38:.18]setStroke];path.lineWidth=1;[path stroke];
NSRect bounds=NSInsetRect(self.bounds,2,3);NSBezierPath *path=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:6 yRadius:6];DYDrawSoftControl(bounds,6,NO,NO,self.cell.highlighted);
NSMutableDictionary *attributes=[NSMutableDictionary dictionaryWithDictionary:DYThemeTextAttributes(self.font?:[NSFont systemFontOfSize:11],[DYThemeColor(@"text")colorWithAlphaComponent:self.enabled?1:.45])];NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.lineBreakMode=NSLineBreakByTruncatingTail;attributes[NSParagraphStyleAttributeName]=paragraph;
CGFloat y=NSMidY(self.bounds)-(self.font?:[NSFont systemFontOfSize:11]).pointSize*.62;
[(self.pullsDown?[self itemAtIndex:0].title:(self.selectedItem.title?:@""))drawInRect:NSMakeRect(9,y,MAX(0,self.bounds.size.width-29),18) withAttributes:attributes];
+3 -3
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>1.8.4</string>
<string>1.8.5</string>
<key>CFBundleVersion</key>
<string>64</string>
<string>67</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
@@ -71,7 +71,7 @@
<key>uuid</key>
<string>1C17B73B-F229-4C09-A434-EAF6DFF5F22A</string>
<key>version</key>
<string>1.8.4</string>
<string>1.8.5</string>
</dict>
<dict>
<key>className</key>
+2 -2
查看文件
@@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.8.4</string>
<string>1.8.5</string>
<key>CFBundleVersion</key>
<string>64</string>
<string>67</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
+18 -16
查看文件
@@ -1,33 +1,35 @@
# 大鱼调色开发交接
2026-11-04,Asia/Shanghai。本轮正式版本1.8.4(64),实际编译源码55b66a358cf4c52eeb6ad89acde822cb73be3137。远程 https://dayu.media/git/dayu/dayu-color.git,main。实际工程 /Volumes/备份/大鱼调色/大鱼调色,Wrapper Application / Release,Objective-C++/AppKit;Apple Silicon,macOS14.6+,本机Xcode27.1/FxPlug4.3.5。
2026-11-04,Asia/Shanghai。当前正式1.8.5(67),实际编译源码d39004c26af3c0c5853111faef7e40e6c66f6aa6。工程 /Volumes/备份/大鱼调色/大鱼调色,main,https://dayu.media/git/dayu/dayu-color.git。AppKit/Objective-C++,Wrapper Application / Release,macOS14.6+,Apple Silicon,Xcode27.1/FxPlug4.3.5。
唯一正式APP /Library/Plug-Ins/FxPlug/大鱼调色.app;ID com.dayu.color / com.dayu.color.XPC。固定缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。签名团队B3W25FX5H5,公证profile codex-dayu-notary-B3W25FX5H5;具体Accepted记录见verification/Delivery.json。不要另建/Applications副本。交付/仓库锁按本机全局规则。
唯一正式APP /Library/Plug-Ins/FxPlug/大鱼调色.app;主ID com.dayu.color,内部com.dayu.color.XPC。固定构建缓存 /Users/mac/Library/Caches/CodexBuilds/com.dayu.color。正式签名团队B3W25FX5H5,公证profile codex-dayu-notary-B3W25FX5H5。交付锁/仓库锁按全局规则。
## 本轮明确的视觉反馈
## 最新视觉要求与结果
用户否定1.8.3“大红大绿”的分模块彩虹色块,只认可保存预设的渐变。候选63改为统一低饱和近黑、轻微暖紫的表面,**该底色已获用户明确认可**。用户随后要求模块/图层按钮强化显示。最终64完整保留63的paletteRGB和DYDrawThemeSurface,不再改底色;只给模块名称小按钮添加统一轻粉青渐变、细边和更亮展开态,给蒙版/删除/再加一层按钮增加低对比底板与更亮图标。保存预设保留原粉紫—青色渐变。
用户已认可浅色拟物版(65,“不错”),随后要求深色同系列:深底、浅字、高亮边框,阴影变光晕。最新要求取代更早“保留近黑底”的历史限制,旧交接已归档research/handoffs/DayuColorThrough1.8.4-20261104.md。不要恢复分模块大红大绿、大片统一紫色或深蓝灰底。
后续不要恢复统一大紫底、深蓝灰方案或按模块分配红绿橙色。底色认可不等于用户已对每个按钮细节作最终美学评价。当前默认炫彩ID6,旧0–5及明确保存的旧选择不改编号;偏好域com.dayu.color.preferences/themeIndex。主题/按钮外观不写调色参数或预设。
最终只保留“浅色 / 深色”两种模式。9个彩色色签已换成两个44pt文字按钮;旧0–6主题及palette已删除,不能再选择。内部偏好ID仍用7/8兼容已认可的浅/深选择;旧0–6读取回落深色,未保存偏好的新用户默认浅色。没有自动跟随系统功能,模式由顶部按钮手动切换,本机实看选择深色。
关键修改仅DYTheme.mm、DYInspector.mm及两个Info.plist。没有改变调色数学、GPU、Uniform、参数ID、CMS、模板或预设格式。模块标题按原state绘更亮展开态;右侧操作仅增加identifier=layerAction用于绘制,原tag/target/action不变。不同主题继续使用既有配色。
浅色为冰蓝底/深青文字、白蓝反光边、柔和投影与内凹滑轨/数值框;深色为中性炭黑、浅色文字、冷白反射边与局部青蓝表面光晕。模块统一中性表面,保存按钮保留蓝紫到青渐变。两套palette及浮雕绘制主体与66一致。主题域com.dayu.color.preferences/themeIndex,与调色工程隔离。
## 验证与交付
仅UI绘制/主题、LUT浏览窗口配色和版本变化,不改数学、CMS、GPU、Uniform、参数ID、预设格式或模板。原生按钮/菜单/焦点/动作不变;无新动画/透明材质,文字不发光。增强对比使用明确边框,减少透明度取消装饰投影/光晕。
605项正式原生检查通过。FCP12.4从正式位置加载1.8.4(64),实看统一底色、强化标题/图层操作底板,展开/折叠正常,直方图拿到57,600采样。前后完整预设均8,590字节、逐字节一致,SHA-256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。详见HostRefined1.8.4.json、InstalledSelfTest.json及research/ui-refined-20261104/validation.md。
## 验证
本轮正式宿主退出后载入新安装版本;未另做相同64版的第二次冷重开、VoiceOver/系统辅助显示矩阵或Instruments采样。280/320/400栏宽及CMS nil/v2/v3不变使用既有原生检查。源码确认用户认可的底色与表面绘制逐字保留。不要把数值检查/暂定评分当作用户美学认可。
610项正式原生检查通过(删除旧主题对应的检查,加入旧模式不可选及双按钮布局核验)。浅/深文字最低sRGB对比4.613/5.665。280/320/400栏宽、深浅两模式、CMS nil/v2/v3不变、直方图与渲染合同通过。FCP12.4使用正式67路径,实看深色卡片/按钮反光与光晕、基础调整展开/收起、凹槽滑杆/数值框及LUT浏览窗口,7/8可切换。直方图57,600有效采样可用。
APP公证34af6e05-cba5-4031-9184-762f758c0889为Accepted,签名、票据、Gatekeeper及唯一发现路径通过。候选63公证记录保存在RefinedCandidate63.json,仅用于视觉沟通,未发布包。正式PKG/Release最终状态见Package.json、Release.json;标签v1.8.4-refined-neon-20261104关联最终包记录,发布后回读另作main提交,不移动标签。APP独立正式安装验收;PKG展开验包不代表重复运行安装脚本。
外观操作前后完整预设8,590字节逐字节相同,SHA256 1f05b3e350dd5fbc054de155062aff87fdd4d46c6a762ee06650ad5bd3363982。65浅色同版冷重开主题保留;67在宿主正式退出后重启载入,后续同版冷重开范围见当前Host报告。VoiceOver实听、完整系统辅助显示矩阵与Instruments未执行。HostTwoModes1.8.5.json、历史HostDualSoft1.8.5.json及HostSoft1.8.5.json、InstalledSelfTest.json和research/ui-soft-20261104/validation.md保留范围,不把数值测试/暂定评分当作用户美学认可。
## 保持的技术合同
APP公证Accepted记录见verification/Delivery.json;签名、票据、Gatekeeper、唯一PluginKit发现路径与启动通过。已认可浅色65记录保留SoftLight65Delivery/SelfTest;66的双主题候选曾验包但未上传,记录Soft66Package.json。最终发行包使用67,不把旧候选当成最新。最终安装包、Release和恢复/清理状态以verification/Package.json、Release.json、SoftRecovery1.8.5.json及SoftCleanup1.8.5.json为准;包完成前不能引用旧Package/Release作1.8.5成功证据。
直方图沿用320×180浮点分析缓存、256档、最多2Hz;透明/非有限像素不计,范围外归端点,共同峰值平方根缩放。RGB页叠亮度与三色,单色页仅相应通道。原流程分析源为一级CST/输入LUT后,新CMS为显示输出转换后、SDR修饰前;不是最终输出/HDR示波器,不保证每个曲线层即时输入。统计在工作线程,UI只画快照;缓存按renderer隔离,失效清空。不要增加全尺寸读取或UI线程像素统计。
## 保持的合同与继续交付
完整预设v7,nil/v2/v3 CMS及模板原默认保持,高级颜色设置默认收起、展开不改参数。完整CMS、UI和恢复历史见research/handoffs/DayuColorThrough1.8.3-20261104.md及其引用的更早交接。源码依赖归档/许可证在ColorManagement,无LFS/子模块;证书/密钥不在Git。本轮未修改NAS后端、网站文章或自动更新清单。
直方图仍用320×180浮点分析缓存、256档、最多2Hz;透明/非有限不计、超范围归端点、共同峰值平方根缩放。RGB叠亮度/三色,单色只相应通道。原流程源为一级CST/输入LUT后,新CMS为显示输出转换后SDR修饰前;不是最终输出/HDR示波器或每层即时输入。工作线程统计,UI画快照,renderer隔离,失效清空。
## 后续流程
预设v7、nil/v2/v3 CMS、模板原默认保持。高级颜色设置默认收起且不写参数。完整历史由归档交接追溯。ColorManagement含8个必要依赖源包/许可证,无LFS/子模块;凭据和证书不在Git。未改NAS后端、网站文章或自动更新清单。
读取当前工作区与实际正式版本,保护其他任务改动。tools/checkpoint.py仅对明确路径提交/推送并核验main,自带仓库锁。tools/deliver.py持有产品交付锁直到宿主验收,保持HEAD以记录实际编译SHA,通过后输入complete。Packaging/build_pkg.py和Packaging/publish_beta.py复用PKG工坊制作、展开校验和Release完整下载;草稿404按历史指南用已登录浏览器下载真实附件后传--verified-download,不重复上传/提前发布。
tools/checkpoint.py对明确路径提交/推送/回读,自带锁。tools/deliver.py持产品锁至宿主验收,HEAD保持实际编译提交,通过后complete。Packaging/build_pkg.py复用PKG工坊严格签名、公证、展开验包;APP独立安装验收,验包不等于执行安装脚本。Packaging/publish_beta.py以已推标签准备草稿;草稿404用正常已登录浏览器下载真实附件后--verified-download,再发布和完整下载回读。不覆盖旧附件、不移动旧标签,保持既有仓库可见性。
只清理本任务生成APP、旧安装备份、提交ZIP、下载和恢复clone;保留正式包、源码、历史包、私人QA媒体。恢复说明RECOVERY.md及对应最终验证报告;Git不替代证书的独立安全备份。
正式验证后只清理本任务生成APP、提交ZIP、临时旧安装备份、下载和恢复clone,保留源码/历史包/私人QA媒体。RECOVERY.md记录恢复方式;源码远程备份不替代签名凭据独立备份。
最终67正式PKG 43010987字节,SHA-256 b4540c2be931d9e042ed1a6f2673c001e4b6e0ec67eef0bc22f4b3977af4952b,公证04fae6f1-7e38-4ab4-8c12-7bcae0ea77fd Accepted,Installer签名/票据/Gatekeeper及20项展开验包通过。源码及正式包记录随v1.8.5-light-dark-20261104标签保存;实际Release/下载回读另见后续Release.json。