From 30d413dc423a739f0c00fede41ffde39f3e11cf0 Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 4 Nov 2026 20:40:36 +0800 Subject: [PATCH] fix: make the viewer panel movable and show all fourteen tools directly --- research/mFilmLookOSC-20261104.md | 10 ++++ verification/HostViewerControls1.9.0.json | 11 +++- verification/Viewer69Candidate.json | 17 ++++++ 大鱼调色/Plugin/DYToolOSC.inc.h | 2 +- 大鱼调色/Plugin/DYViewerControls.inc.h | 56 +++++++++++-------- .../Plugin/DYViewerControlsDiagnostics.inc.h | 19 ++++++- 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 8 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 verification/Viewer69Candidate.json diff --git a/research/mFilmLookOSC-20261104.md b/research/mFilmLookOSC-20261104.md index 9f07236..e3d9405 100644 --- a/research/mFilmLookOSC-20261104.md +++ b/research/mFilmLookOSC-20261104.md @@ -65,3 +65,13 @@ REA 已关闭。完整证据为同目录 evidence-bundle.json;同目录另有 1.9.0(69)签名、公证 Accepted、票据、Gatekeeper、唯一 PluginKit 路径与正式安装 648 项原生检查均通过。FCP 已加载并显示图像与新入口。自动坐标点击没有原生 hit/event 证据;本项目 1.4.0/1.4.1 已记录同机 CUA 输入限制,随后实际鼠标成功。因此不能把自动输入无回调当作黑边或新控件导致原生鼠标失败的证据。69 的图像内锚定保留为布局改进。 已请求用户用实际鼠标展开、拖动、一次撤销。此项确认前不声称完整宿主验收通过,不发布安装包。状态见 verification/HostViewerControls1.9.0.json;原生自检结果见 verification/InstalledSelfTest.json。 + +## 用户明确的 70 修正 + +用户澄清:69 可调整参数,但整个面板无法拖动位置;其它工具藏在模块标题菜单里不清楚。70 增加标题整组移动与直接可见的十四工具按钮。图层选择按钮增加“图层 ▾”文字。默认基础参数先显示曝光/影调,再显示颜色参数;独立 UUID 和既有数学不变。 + +原版通用位置拖动依据:OSCView::setMoveVec 0x10005b5f8,drag=1 允许自身二维位移、drag=0 向父视图传递、drag=2 不移动自身;initialOSC 的 0x1000292b4、0x1000299e8 创建 drag=1 图像容器。mouseDrag 0x10000463c(ev_889e7b4ee2ff8413b326c083dd336e9d602608f2e4d59a35b398412b9ca671ad)在超过门槛后分发通用移动,仅滑杆 ID 另行写参数;mouseUp 0x100005724(ev_7ba43ef534545c3c16f1633f4ee7911a343b72289a8ad1ba6e6d86a96d1b12c5)补算最后位置,调用 addMoveVecToPosition;OSCView 0x10005b85c 固定位置并清临时位移。 + +接收实现按下保存标题原点和指针起点,超过门槛后整组重建绘制/命中位置,松开不触发收起。拖面板不调用参数桥接,不产生调色撤销。位置在当前会话保留,缩放/开合时按图像可见区域夹紧。十四按钮指本项目已有工具,未新增 mFilmLook 的渲染算法。 + +修正前 652 项原生检查通过;复审另修正被播放头变化打断时的拖动提示残留,并新增中断检查。最终以正式构建自检记录为准。 diff --git a/verification/HostViewerControls1.9.0.json b/verification/HostViewerControls1.9.0.json index a17c5c5..7f8d087 100644 --- a/verification/HostViewerControls1.9.0.json +++ b/verification/HostViewerControls1.9.0.json @@ -1,5 +1,5 @@ { - "status": "awaiting-physical-pointer-verification", + "status": "superseded-by-panel-movement-and-tool-bar-correction", "version": "1.9.0", "build": "69", "sourceCommit": "0ab448d04f4fa61af1a371e17806df67b78a380b", @@ -22,5 +22,12 @@ "Then finish cleanup, final PKG validation and Release upload/download verification" ], "automationLimitation": "CUA coordinate clicks/drags did not produce native OSC hit/event evidence; the same limitation is recorded in ToolMaskImplementation.md and MaskWorkflow1.4.1.md. This is not evidence that a physical mouse fails.", - "userQuestionPresented": true + "userQuestionPresented": true, + "userFeedback": [ + "展开、拖动、撤销都正常", + "不对,不能拖,只能调整", + "整个面板不能拖动位置", + "而且只有一个基础调色,其它工具怎么没有目标插件是有很多工具的" + ], + "interpretation": "Parameter adjustment was confirmed; whole-panel movement was missing and the catalog-only tool switch was not discoverable. Build70 corrects these two issues." } diff --git a/verification/Viewer69Candidate.json b/verification/Viewer69Candidate.json new file mode 100644 index 0000000..84127de --- /dev/null +++ b/verification/Viewer69Candidate.json @@ -0,0 +1,17 @@ +{ + "status": "installed-awaiting-host-verification", + "path": "/Library/Plug-Ins/FxPlug/大鱼调色.app", + "bundleID": "com.dayu.color", + "version": "1.9.0", + "build": "69", + "team": "B3W25FX5H5", + "notaryID": "bd821a49-f910-45f6-ad18-43d3b3398aab", + "notaryStatus": "Accepted", + "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", + "sourceCommit": "0ab448d04f4fa61af1a371e17806df67b78a380b", + "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", + "templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891", + "shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-26e470123a7445029efa4dd24626dd3e.app", + "hostResult": "User confirmed parameter adjustment; clarified the whole panel cannot move and the other tools are not discoverable. Superseded by build70; not packaged or released." +} diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index 5b81a30..0e39b76 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -61,7 +61,7 @@ - (void)mouseUpAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseUp x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)keyDownAtPositionX:(double)x positionY:(double)y keyPressed:(unsigned short)key modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update didHandle:(BOOL*)handled atTime:(CMTime)t{BOOL result=(key==27||key==13||key==10||key==3||key==8||key==127)&&[self event:NSEventTypeKeyDown x:x y:y part:1 modifiers:m key:key time:t];if(update)*update=result;if(handled)*handled=result;} - (void)mouseMovedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){ - DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue];NSCursor *cursor=viewerHit?NSCursor.pointingHandCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(drawing&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||drawing; + DYPlugIn*plugin=[self pluginAtTime:t];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:t];NSPoint point=NSMakePoint(x,_height-y);NSInteger viewerHit=[_viewerControls partAtPoint:point];BOOL redraw=[_viewerControls mouseMoved:point];NSDictionary *mask=[plugin toolCanvasMaskAtTime:t];BOOL drawing=[mask[@"drawing"]boolValue];NSCursor *cursor=viewerHit==20000?([_viewerControls capturing]?NSCursor.closedHandCursor:NSCursor.openHandCursor):viewerHit?NSCursor.pointingHandCursor:part>=10000?NSCursor.pointingHandCursor:(drawing||part>=1000)?NSCursor.crosshairCursor:part?NSCursor.openHandCursor:NSCursor.arrowCursor;[[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)]setCursor:cursor];if(drawing&&!viewerHit)[self event:NSEventTypeMouseMoved x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=redraw||drawing; }} - (void)mouseEnteredAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{[self mouseMovedAtPositionX:x positionY:y activePart:0 modifiers:m forceUpdate:update atTime:t];} - (void)mouseExitedAtPositionX:(double)x positionY:(double)y modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{@synchronized(self){BOOL changed=[_viewerControls mouseExited];if(update)*update=changed;}} diff --git a/大鱼调色/Plugin/DYViewerControls.inc.h b/大鱼调色/Plugin/DYViewerControls.inc.h index 396aca0..a5b41bb 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -15,16 +15,16 @@ static const NSInteger DYViewerPartBase=20000; @end @implementation DYViewerControls { DYViewerParameterBridge *_bridge;NSDictionary *_snapshot;NSArray *_nodes,*_rows;NSMutableArray *_areas; - NSString *_nodeID;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft; + NSString *_nodeID;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft,_positioned,_movingPanel;NSPoint _position,_panelStart; NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured; double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime; } @synthesize bridge=_bridge; - (instancetype)init{if((self=[super init])){_areas=[NSMutableArray new];_nodeID=[@"base:base" copy];_scale=1;_time=_downTime=kCMTimeInvalid;}return self;} - (void)dealloc{[_bridge endGesture];[_bridge release];[_snapshot release];[_nodes release];[_rows release];[_areas release];[_nodeID release];[_captured release];[super dealloc];} -- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;[_captured release];_captured=nil;} +- (void)setBridge:(DYViewerParameterBridge*)bridge{if(bridge==_bridge)return;[_bridge endGesture];[_bridge release];_bridge=[bridge retain];_pressed=0;_dragging=NO;_movingPanel=NO;[_captured release];_captured=nil;} - (BOOL)capturing{return _pressed!=0;} -- (BOOL)finishCapture{BOOL had=_pressed!=0;[_bridge endGesture];_pressed=0;_hasDraft=NO;[_captured release];_captured=nil;return had;} +- (BOOL)finishCapture{BOOL had=_pressed!=0;[_bridge endGesture];_pressed=0;_hasDraft=NO;_movingPanel=NO;_dragging=NO;[_captured release];_captured=nil;return had;} - (NSDictionary*)descriptorForKey:(NSString*)key{for(NSDictionary*d in DYDescriptors())if([d[@"key"]isEqual:key])return d;return nil;} - (NSDictionary*)node{for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:_nodeID])return n;return nil;} - (double)valueForDescriptor:(NSDictionary*)d{ @@ -39,7 +39,7 @@ static const NSInteger DYViewerPartBase=20000; - (void)setViewport:(NSRect)viewport{_viewport=viewport;_hasViewport=YES;} - (void)prepareWithSize:(NSSize)canvasSize scale:(CGFloat)scale atTime:(CMTime)time{ _size=canvasSize;NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,canvasSize.width,canvasSize.height)):NSMakeRect(0,0,canvasSize.width,canvasSize.height);NSSize size=viewport.size;_scale=MAX(.6,MIN(MAX(1.,scale),MIN(size.width/360.,size.height/230.)));_time=time; - if(_pressed&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_downTime)!=0)){[_bridge endGesture];_pressed=0;[_captured release];_captured=nil;} + if(_pressed&&(!CMTIME_IS_NUMERIC(time)||CMTimeCompare(time,_downTime)!=0)){[self finishCapture];} [_snapshot release];_snapshot=[[_bridge snapshotAtTime:time]retain];NSDictionary*doc=_snapshot[@"document"]; NSMutableArray*nodes=[NSMutableArray array];NSMutableDictionary*counts=[NSMutableDictionary dictionary]; for(NSString*ID in DYToolDisplayOrder(doc?:@{})){ @@ -48,20 +48,27 @@ static const NSInteger DYViewerPartBase=20000; NSInteger count=[counts[type]integerValue];counts[type]=@(count+1);if(!base)title=[title stringByAppendingFormat:@" · %ld",(long)(count+1)]; [nodes addObject:@{@"id":ID,@"type":type,@"title":title,@"layer":layer?:@{}}]; }[_nodes release];_nodes=[nodes copy]; - if(![self node]&&_nodes.count){[_bridge endGesture];_pressed=0;[_captured release];_captured=nil;[_nodeID release];_nodeID=[_nodes[0][@"id"]copy];_page=0;} + if(![self node]&&_nodes.count){[self finishCapture];[_nodeID release];_nodeID=[_nodes[0][@"id"]copy];_page=0;} NSString*type=[self node][@"type"];NSMutableArray*rows=[NSMutableArray array]; // These are the existing public scalar controls, never hidden curve-slot metadata. - NSArray*sections=[type isEqual:@"base"]?@[@"color",@"base"]:type?@[type]:@[]; + NSArray*sections=[type isEqual:@"base"]?@[@"base",@"color"]:type?@[type]:@[]; for(NSString*part in sections)for(NSDictionary*d in DYToolSection(part)[@"rows"]){NSString*k=d[@"key"];if(!d[@"pid"]||[k hasPrefix:@"cmbypass"]||[k isEqual:@"copyAutoGrade"]||([type isEqual:@"curve"]&&![k hasPrefix:@"curveY"]))continue;[rows addObject:d];} [_rows release];_rows=[rows copy];[_areas removeAllObjects];if(!_bridge||size.width<120||size.height<80)return; - CGFloat s=_scale,margin=10*s,w=MIN(286*s,size.width-2*margin),x=viewport.origin.x+MAX(margin,size.width-w-margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-128*s)/(46*s)))); - _catalogCapacity=MAX(2,MIN(8,2*(NSInteger)floor((size.height-2*margin-100*s)/(35*s))));if(size.width<200*s||size.height<166*s)_open=NO; + CGFloat s=_scale,margin=10*s,w=MIN(286*s,size.width-2*margin),x=viewport.origin.x+MAX(margin,size.width-w-margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-192*s)/(46*s)))); + _catalogCapacity=MAX(2,MIN(8,2*(NSInteger)floor((size.height-2*margin-164*s)/(35*s))));if(size.width<200*s||size.height<230*s)_open=NO; _page=MIN(MAX(0,_page),MAX(0,((NSInteger)_rows.count-1)/_capacity));_catalogPage=MIN(MAX(0,_catalogPage),MAX(0,((NSInteger)_nodes.count-1)/_catalogCapacity)); - CGFloat h=!_open?30*s:_catalog?(100+35*ceil(MIN((double)_catalogCapacity,MAX(0.,(double)_nodes.count-_catalogPage*_catalogCapacity))/2))*s:(100+46*MIN(_capacity,(NSInteger)_rows.count))*s; - _panel=NSMakeRect(x,viewport.origin.y+margin,w,MIN(h,size.height-2*margin)); - [self addArea:NSMakeRect(x,viewport.origin.y+margin,w,30*s) part:20000 kind:@"open" title:_open?@"画面调色 ▴":@"画面调色 ▾" descriptor:nil index:0];if(!_open)return; - CGFloat y=viewport.origin.y+margin+36*s; - [self addArea:NSMakeRect(x+8*s,y,w-([type isEqual:@"base"]?126:84)*s,28*s) part:20002 kind:@"catalog" title:[self node][@"title"]?:@"等待画面" descriptor:nil index:0]; + CGFloat h=!_open?30*s:_catalog?(164+35*ceil(MIN((double)_catalogCapacity,MAX(0.,(double)_nodes.count-_catalogPage*_catalogCapacity))/2))*s:(164+46*MIN(_capacity,(NSInteger)_rows.count))*s; + CGFloat panelHeight=MIN(h,size.height-2*margin),top=viewport.origin.y+margin; + if(_positioned){x=MAX(viewport.origin.x+margin,MIN(NSMaxX(viewport)-margin-w,viewport.origin.x+_position.x*size.width));top=MAX(viewport.origin.y+margin,MIN(NSMaxY(viewport)-margin-panelHeight,viewport.origin.y+_position.y*size.height));_position=NSMakePoint((x-viewport.origin.x)/MAX(1.,size.width),(top-viewport.origin.y)/MAX(1.,size.height));} + _panel=NSMakeRect(x,top,w,panelHeight); + [self addArea:NSMakeRect(x,top,w,30*s) part:20000 kind:@"open" title:_open?@"⠿ 画面调色 ▴":@"⠿ 画面调色 ▾" descriptor:nil index:0];if(!_open)return; + CGFloat y=top+36*s;NSArray*shortTitles=@[@"一级",@"蜘蛛",@"基础",@"肤色",@"LUT",@"HSL",@"曲线",@"分级",@"原色",@"色阶",@"黑白",@"平衡",@"通道",@"胶片"]; + CGFloat toolWidth=(w-40*s)/7; + for(NSUInteger i=0;i.5; + BOOL selected=([kind isEqual:@"module"]&&[a[@"nodeID"]isEqual:_nodeID])||([kind isEqual:@"tool"]&&[a[@"toolType"]isEqual:[self node][@"type"]]);BOOL on=([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])&&[self valueForDescriptor:d]>.5; DYDrawSoftControl(r,5*s,NO,hover||selected||on,pressed);NSString*title=a[@"title"]; if(d&&![kind isEqual:@"reset"]){NSString*value=[self valueText:d value:[self valueForDescriptor:d]];title=[kind isEqual:@"headerBool"]?[title stringByAppendingString:[self valueForDescriptor:d]>.5?@"●":@"○"]:[NSString stringWithFormat:@"%@ %@%@",title,value,[kind isEqual:@"choice"]?@" ›":@""];} - [self text:title rect:NSInsetRect(r,5*s,5*s) size:[kind isEqual:@"open"]?12:11 color:ink alignment:NSTextAlignmentCenter]; + [self text:title rect:NSInsetRect(r,5*s,5*s) size:[kind isEqual:@"open"]?12:11 color:[kind isEqual:@"toolUnavailable"]?[ink colorWithAlphaComponent:.35]:ink alignment:NSTextAlignmentCenter]; } } - if(_open){NSInteger cap=_catalog?_catalogCapacity:_capacity,total=_catalog?_nodes.count:_rows.count,page=_catalog?_catalogPage:_page;NSString*hint=total>cap?[NSString stringWithFormat:@"%ld / %ld",(long)(page+1),(long)((total+cap-1)/cap)]:(_snapshot?@"拖动调节 · ↺ 还原此项":@"请移动播放头以读取画面");[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-23*s,_panel.size.width-80*s,18*s) size:10 color:ink alignment:NSTextAlignmentCenter];} + if(_open){NSInteger cap=_catalog?_catalogCapacity:_capacity,total=_catalog?_nodes.count:_rows.count,page=_catalog?_catalogPage:_page;NSString*hint=total>cap?[NSString stringWithFormat:@"%ld / %ld",(long)(page+1),(long)((total+cap-1)/cap)]:(_snapshot?@"拖动调节 · ↺ 还原此项":@"请移动播放头以读取画面");NSDictionary*hoverArea=[self areaForPart:_hover];if(_hover==20000||_movingPanel)hint=@"按住标题拖动位置 · 单击收起";else if(hoverArea[@"help"])hint=hoverArea[@"help"];[self text:hint rect:NSMakeRect(_panel.origin.x+40*s,NSMaxY(_panel)-23*s,_panel.size.width-80*s,18*s) size:10 color:ink alignment:NSTextAlignmentCenter];} [NSGraphicsContext restoreGraphicsState]; } -- (NSInteger)partAtPoint:(NSPoint)p{if(!std::isfinite(p.x)||!std::isfinite(p.y)||!_bridge||!NSPointInRect(p,NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height))))return 0;for(NSDictionary*a in [_areas reverseObjectEnumerator])if(NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];return _open&&NSPointInRect(p,_panel)?20006:0;} +- (NSInteger)partAtPoint:(NSPoint)p{if(!std::isfinite(p.x)||!std::isfinite(p.y)||!_bridge||!NSPointInRect(p,NSIntersectionRect(_panel,NSMakeRect(0,0,_size.width,_size.height))))return 0;for(NSDictionary*a in [_areas reverseObjectEnumerator])if(![a[@"kind"]isEqual:@"toolUnavailable"]&&NSPointInRect(p,[a[@"rect"]rectValue]))return [a[@"part"]integerValue];return _open&&NSPointInRect(p,_panel)?20006:0;} - (NSDictionary*)areaForPart:(NSInteger)part{for(NSDictionary*a in _areas)if([a[@"part"]integerValue]==part)return a;return nil;} - (void)applySliderPoint:(NSPoint)p{ NSRect t=[self trackForArea:_captured];NSDictionary*d=_captured[@"descriptor"];double ratio=MAX(0.,MIN(1.,(p.x-_knobOffset-t.origin.x)/MAX(1.,t.size.width)));_draftValue=[d[@"min"]doubleValue]+ratio*([d[@"max"]doubleValue]-[d[@"min"]doubleValue]);[_bridge changeValue:_draftValue]; } - (void)clickArea:(NSDictionary*)a{ NSString*kind=a[@"kind"];if([kind isEqual:@"open"]||[kind isEqual:@"close"]){_open=!_open;_catalog=NO;return;}if([kind isEqual:@"catalog"]){_catalog=!_catalog;return;} - if([kind isEqual:@"module"]){for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:a[@"nodeID"]]){[_nodeID release];_nodeID=[a[@"nodeID"]copy];_catalog=NO;_page=0;break;}return;} + if([kind isEqual:@"module"]||[kind isEqual:@"tool"]){for(NSDictionary*n in _nodes)if([n[@"id"]isEqual:a[@"nodeID"]]){[_nodeID release];_nodeID=[a[@"nodeID"]copy];_catalog=NO;_page=0;break;}return;} if([kind isEqual:@"previous"]||[kind isEqual:@"next"]){NSInteger total=_catalog?_nodes.count:_rows.count,cap=_catalog?_catalogCapacity:_capacity,count=MAX(1,(total+cap-1)/cap),delta=[kind isEqual:@"next"]?1:-1;if(_catalog)_catalogPage=(_catalogPage+delta+count)%count;else _page=(_page+delta+count)%count;return;} NSDictionary*d=a[@"descriptor"];if(!d||!_snapshot)return;double old=[self valueForDescriptor:d],v=old; if([kind isEqual:@"reset"])v=[d[@"default"]doubleValue];else if([kind isEqual:@"bool"]||[kind isEqual:@"headerBool"])v=old>.5?0:1;else if([kind isEqual:@"choice"]){NSArray*values=d[@"values"],*options=d[@"options"];NSInteger i=values?[values indexOfObject:@((NSInteger)llround(old))]:(NSInteger)llround(old);if(!options.count)return;i=(i+1)%options.count;v=values?[values[i]doubleValue]:i;} [_bridge beginParameter:d node:_nodeID value:old atTime:_time];[_bridge changeValue:v];[_bridge endGesture]; } +- (void)movePanelToPointer:(NSPoint)p{ + NSRect viewport=_hasViewport?NSIntersectionRect(_viewport,NSMakeRect(0,0,_size.width,_size.height)):NSMakeRect(0,0,_size.width,_size.height);CGFloat margin=10*_scale; + CGFloat x=MAX(NSMinX(viewport)+margin,MIN(NSMaxX(viewport)-margin-_panel.size.width,_panelStart.x+p.x-_down.x)),y=MAX(NSMinY(viewport)+margin,MIN(NSMaxY(viewport)-margin-_panel.size.height,_panelStart.y+p.y-_down.y)); + _position=NSMakePoint((x-viewport.origin.x)/MAX(1.,viewport.size.width),(y-viewport.origin.y)/MAX(1.,viewport.size.height));_positioned=YES;_movingPanel=YES;[self prepareWithSize:_size scale:_scale atTime:_time]; +} - (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{ if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];NSInteger hit=[self partAtPoint:p]; - if(type==NSEventTypeLeftMouseDown){if(!hit)return NO;[_bridge endGesture];_hasDraft=NO;_pressed=hit;_down=p;_downTime=time;_dragging=NO;[_captured release];_captured=[[self areaForPart:hit]copy];NSDictionary*d=_captured[@"descriptor"]; + if(type==NSEventTypeLeftMouseDown){if(!hit)return NO;[_bridge endGesture];_hasDraft=NO;_pressed=hit;_down=p;_panelStart=_panel.origin;_downTime=time;_dragging=NO;_movingPanel=NO;[_captured release];_captured=[[self areaForPart:hit]copy];NSDictionary*d=_captured[@"descriptor"]; if([_captured[@"kind"]isEqual:@"slider"]&&_snapshot){NSRect t=[self trackForArea:_captured];if(NSPointInRect(p,NSInsetRect(t,-8*_scale,-8*_scale))){_downValue=[self valueForDescriptor:d];_draftValue=_downValue;_hasDraft=YES;[_bridge beginParameter:d node:_nodeID value:_downValue atTime:time];CGFloat knob=t.origin.x+(_downValue-[d[@"min"]doubleValue])/([d[@"max"]doubleValue]-[d[@"min"]doubleValue])*t.size.width;_knobOffset=fabs(p.x-knob)<=8*_scale?p.x-knob:0;if(fabs(p.x-knob)>8*_scale)[self applySliderPoint:p];}}return YES; } if(!_pressed)return NO; - if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;} - if(type==NSEventTypeLeftMouseUp){BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed; + if(type==NSEventTypeLeftMouseDragged){if(fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale)_dragging=YES;if(_dragging&&[_captured[@"kind"]isEqual:@"open"])[self movePanelToPointer:p];if(_dragging&&_hasDraft&&[_captured[@"kind"]isEqual:@"slider"]&&_snapshot)[self applySliderPoint:p];return YES;} + if(type==NSEventTypeLeftMouseUp){if([_captured[@"kind"]isEqual:@"open"]&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self movePanelToPointer:p];BOOL moved=_movingPanel;BOOL slider=[_captured[@"kind"]isEqual:@"slider"];NSDictionary*a=[_captured retain];NSInteger pressed=_pressed; if(slider){if(_hasDraft&&(_dragging||fabs(p.x-_down.x)>2*_scale||fabs(p.y-_down.y)>2*_scale))[self applySliderPoint:p];[_bridge endGesture];} - _pressed=0;_dragging=NO;_hasDraft=NO;[_captured release];_captured=nil;if(!slider&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;} + _pressed=0;_dragging=NO;_movingPanel=NO;_hasDraft=NO;[_captured release];_captured=nil;if(!moved&&!slider&&hit==pressed&&(!a[@"nodeID"]||[a[@"nodeID"]isEqual:[self areaForPart:hit][@"nodeID"]]))[self clickArea:a];[a release];[self prepareWithSize:_size scale:_scale atTime:time];return YES;} return NO; } - (BOOL)mouseMoved:(NSPoint)p{NSInteger part=[self partAtPoint:p];BOOL changed=part!=_hover;_hover=part;return changed;} diff --git a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h index 499ed8d..9c68d44 100644 --- a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h @@ -12,9 +12,24 @@ run.record(@"viewer-controls-start-collapsed-without-hidden-slider-hit",[[controls valueForKey:@"areas"]count]==1&&[controls partAtPoint:NSMakePoint(450,200)]==0); NSRect header=[areaFor(@"open",nil)[@"rect"]rectValue];NSPoint hp=NSMakePoint(NSMidX(header),NSMidY(header)); [controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(10,390) atTime:host->_time]; - run.record(@"viewer-controls-button-release-outside-cancels-activation",[[controls valueForKey:@"areas"]count]==1&&![controls capturing]); + NSRect movedHeader=[areaFor(@"open",nil)[@"rect"]rectValue];run.record(@"viewer-controls-collapsed-header-drag-moves-position-without-expanding",[[controls valueForKey:@"areas"]count]==1&&![controls capturing]&&fabs(movedHeader.origin.x-header.origin.x)>5&&[initial isEqual:base->_values]&&base->_undoStarts==undo); click(areaFor(@"open",nil)); run.record(@"viewer-controls-expand-is-separate-from-effect-enabling",areaFor(@"slider",@"exposure")!=nil&&[initial isEqual:base->_values]&&base->_undoStarts==undo); + NSMutableSet*visibleTypes=[NSMutableSet set];BOOL allSwitch=YES;for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"kind"]isEqual:@"tool"])[visibleTypes addObject:a[@"toolType"]]; + run.record(@"viewer-controls-show-all-fourteen-existing-tools-directly",visibleTypes.count==DYToolTypes().count&&[visibleTypes isEqual:[NSSet setWithArray:DYToolTypes()]]); + for(NSString*type in DYToolTypes()){NSDictionary*tool=nil;for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"toolType"]isEqual:type]){tool=[[a copy]autorelease];break;}NSString*ID=[[tool[@"nodeID"]copy]autorelease];click(tool);allSwitch&=[[controls valueForKey:@"nodeID"]isEqual:ID]&&[[controls valueForKey:@"rows"]count]>0;} + run.record(@"viewer-controls-direct-tool-switches-never-write-grading-parameters",allSwitch&&[initial isEqual:base->_values]&&base->_undoStarts==undo); + for(NSDictionary*a in [controls valueForKey:@"areas"])if([a[@"toolType"]isEqual:@"base"]){click([[a copy]autorelease]);break;} + NSRect beforePanel=[[controls valueForKey:@"panel"]rectValue];NSMutableDictionary*beforeAreas=[NSMutableDictionary dictionary];for(NSDictionary*a in [controls valueForKey:@"areas"])beforeAreas[a[@"part"]]=a[@"rect"]; + header=[areaFor(@"open",nil)[@"rect"]rectValue];hp=NSMakePoint(NSMidX(header),NSMidY(header));[controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+80,hp.y-5) atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(hp.x+130,hp.y-10) atTime:host->_time]; + NSRect afterPanel=[[controls valueForKey:@"panel"]rectValue];CGFloat dx=afterPanel.origin.x-beforePanel.origin.x,dy=afterPanel.origin.y-beforePanel.origin.y;BOOL groupMoves=fabs(dx-130)<1e-5&&fabs(dy+10)<1e-5; + for(NSDictionary*a in [controls valueForKey:@"areas"]){NSRect before=[beforeAreas[a[@"part"]]rectValue],after=[a[@"rect"]rectValue];groupMoves&=fabs(after.origin.x-before.origin.x-dx)<1e-5&&fabs(after.origin.y-before.origin.y-dy)<1e-5;} + run.record(@"viewer-controls-expanded-header-drag-moves-all-tool-and-parameter-hit-regions-together",groupMoves&&areaFor(@"slider",@"exposure")!=nil&&[initial isEqual:base->_values]&&base->_undoStarts==undo&&![controls capturing]); + header=[areaFor(@"open",nil)[@"rect"]rectValue];hp=NSMakePoint(NSMidX(header),NSMidY(header));[controls event:NSEventTypeLeftMouseDown point:hp atTime:host->_time];[controls event:NSEventTypeLeftMouseDragged point:NSMakePoint(hp.x+10,hp.y+5) atTime:host->_time];[controls prepareWithSize:NSMakeSize(640,400) scale:1 atTime:CMTimeMake(1,24)]; + run.record(@"viewer-controls-playhead-interruption-clears-all-panel-drag-state",![controls capturing]&&![[controls valueForKey:@"movingPanel"]boolValue]&&![[controls valueForKey:@"dragging"]boolValue]&&base->_undoStarts==undo);publish(); + NSRect resetRect=[areaFor(@"reset",@"exposure")[@"rect"]rectValue];NSPoint resetPoint=NSMakePoint(NSMidX(resetRect),NSMidY(resetRect));[controls event:NSEventTypeLeftMouseDown point:resetPoint atTime:host->_time];[controls event:NSEventTypeLeftMouseUp point:NSMakePoint(-1,-1) atTime:host->_time];drain(); + run.record(@"viewer-controls-ordinary-button-release-outside-still-cancels-action",[initial isEqual:base->_values]&&base->_undoStarts==undo); + click(areaFor(@"headerBool",@"baseEnabled"));drain();publish(); run.record(@"viewer-controls-tone-eye-does-not-misrepresent-the-separate-color-eye",value(@"baseEnabled")==0&&value(@"colorEnabled")==1&&areaFor(@"headerBool",@"colorEnabled")!=nil); click(areaFor(@"headerBool",@"baseEnabled"));drain();publish();undo=base->_undoStarts; @@ -41,7 +56,7 @@ run.record(@"viewer-controls-module-button-retains-identity-when-a-layer-is-deleted-during-press",module&&[[controls valueForKey:@"nodeID"]isEqual:selected]);click(areaFor(@"catalog",nil)); NSDictionary*open=areaFor(@"open",nil);NSRect openRect=[open[@"rect"]rectValue];NSPoint hover=NSMakePoint(NSMidX(openRect),NSMidY(openRect)); run.record(@"viewer-controls-hover-and-exit-request-redraw-only-when-state-changes",[controls mouseMoved:hover]&&![controls mouseMoved:hover]&&[controls mouseExited]&&![controls mouseExited]); - click(open);run.record(@"viewer-controls-collapse-hides-the-entire-interactive-subtree",[[controls valueForKey:@"areas"]count]==1&&[controls partAtPoint:NSMakePoint(450,200)]==0); + click(open);run.record(@"viewer-controls-collapse-hides-the-entire-interactive-subtree",[[controls valueForKey:@"areas"]count]==1); BOOL bounded=YES;for(NSSize size:{NSMakeSize(120,80),NSMakeSize(200,130),NSMakeSize(320,240),NSMakeSize(1280,720)})for(CGFloat scale:{1.,2.}){ [controls prepareWithSize:size scale:scale atTime:host->_time];click(areaFor(@"open",nil)); bounded&=[controls partAtPoint:NSMakePoint(-1,20)]==0&&[controls partAtPoint:NSMakePoint(size.width+1,20)]==0&&[controls partAtPoint:NSMakePoint(50,size.height+1)]==0; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 5e82e02..be657d9 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.9.0 CFBundleVersion - 69 + 70 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index d6ef59d..d606964 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.9.0 CFBundleVersion - 69 + 70 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright