From 0ab448d04f4fa61af1a371e17806df67b78a380b Mon Sep 17 00:00:00 2001 From: mac Date: Wed, 4 Nov 2026 19:46:52 +0800 Subject: [PATCH] fix: anchor canvas controls within the host image viewport --- research/mFilmLookOSC-20261104.md | 4 ++++ verification/Viewer68Candidate.json | 17 +++++++++++++++++ 大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h | 6 +++--- 大鱼调色/Plugin/DYToolOSC.inc.h | 8 ++++---- 大鱼调色/Plugin/DYViewerControls.inc.h | 16 +++++++++------- .../Plugin/DYViewerControlsDiagnostics.inc.h | 2 ++ 大鱼调色/Plugin/DYViewerControlsProbe.h | 1 + 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 9 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 verification/Viewer68Candidate.json diff --git a/research/mFilmLookOSC-20261104.md b/research/mFilmLookOSC-20261104.md index 77752bc..4d39df4 100644 --- a/research/mFilmLookOSC-20261104.md +++ b/research/mFilmLookOSC-20261104.md @@ -55,3 +55,7 @@ REA 已关闭。完整证据为同目录 evidence-bundle.json;同目录另有 本项目显式增加单项 ↺ 复位;不声称参考插件有双击复位或 Shift 精调。默认值标记、既有浅/深主题、独立图层 UUID 路由与冲突保护均属于项目适配。2 像素门槛按实际绘制比例换算。鼠标移出只清悬停,不中断仍被捕获的滑杆;播放头/节点失效或 OSC 释放会结束写入组。 正式构建前 647 项离屏原生检查通过:20 项桥接、16 项界面状态/边界及原有功能,另包含真实 Metal 蒙版跨面板拖动回归。最终正式安装自检及 FCP 实测结果另记 verification。 + +## 68 候选宿主修正 + +正式候选 68 的入口落在宿主黑边,未通过交互验收。69 将整组布局锚定到实际 OBJECT→CANVAS 图像矩形与画布的交集;不将黑边上可绘制等同于可接收鼠标事件。68 不打包、不发布;公证记录保留,正式交付以最终验收构建为准。 diff --git a/verification/Viewer68Candidate.json b/verification/Viewer68Candidate.json new file mode 100644 index 0000000..60d399e --- /dev/null +++ b/verification/Viewer68Candidate.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": "68", + "team": "B3W25FX5H5", + "notaryID": "fa8512c4-c6e1-4822-a333-ef3d3e76235c", + "notaryStatus": "Accepted", + "gatekeeper": "/Library/Plug-Ins/FxPlug/大鱼调色.app: accepted\nsource=Notarized Developer ID", + "sourceCommit": "cc037340bf45e769e86a721a4fec8db440cf467e", + "templatePath": "/Users/mac/Movies/Motion Templates.localized/Effects.localized/大鱼调色/大鱼调色/大鱼调色.moef", + "templateSHA256": "3f4f642146ae60710b865bd131c0d0be458e6430de54b50bd49dc9637643c891", + "shaderSHA256": "38395fc34a3e3f222c34abc7b643df820f6a3c1a12eac52f2f9a6beaa0a7da76", + "previousInstallBackup": "/Library/Plug-Ins/FxPlug/.dayu-color-previous-ed38e8c088e64ebfa3eac829b7fc04b1.app", + "hostResult": "Not accepted: collapsed viewer entry was drawn in letterbox; correcting viewport anchoring before final delivery." +} diff --git a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h index 6e6d857..b3d3ec8 100644 --- a/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYToolCanvasDiagnostics.inc.h @@ -16,11 +16,11 @@ idplugin=(id)[[NSClassFromString(@"DYPlugIn")alloc]initWithAPIManager:host];[plugin scheduleToolCanvasRegistration];NSData*state=nil;[plugin pluginState:&state atTime:kCMTimeZero quality:(FxQuality)0 error:&error]; auto drain=[](){double end=NSProcessInfo.processInfo.systemUptime+.06;while(NSProcessInfo.processInfo.systemUptimeosc=(id)[[NSClassFromString(@"DYToolOSC")alloc]initWithAPIManager:host];DYDiagnosticTile*overlay=[[[DYDiagnosticTile alloc]initWithDevice:gpu width:640 height:400]autorelease];[osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];BOOL update=NO;NSInteger part=0; - [osc hitTestOSCAtMousePositionX:480 mousePositionY:375 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:480 positionY:375 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:480 positionY:375 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; + [osc hitTestOSCAtMousePositionX:480 mousePositionY:375 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:480 positionY:345 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:480 positionY:345 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; [osc drawOSCWithWidth:640 height:400 activePart:0 destinationImage:overlay atTime:kCMTimeZero];int undo=base->_undoStarts; - [osc hitTestOSCAtMousePositionX:320 mousePositionY:212.5 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:320 positionY:212.5 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; + [osc hitTestOSCAtMousePositionX:260 mousePositionY:212.5 activePart:&part atTime:kCMTimeZero];[osc mouseDownAtPositionX:260 positionY:212.5 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero]; [osc hitTestOSCAtMousePositionX:450 mousePositionY:200 activePart:&part atTime:kCMTimeZero];BOOL insideViewer=part>=20000;[osc mouseDraggedAtPositionX:450 positionY:200 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];[osc mouseUpAtPositionX:450 positionY:200 activePart:part modifiers:0 forceUpdate:&update atTime:kCMTimeZero];drain(); DYMaskParameters p=DYMaskAtTime(DYReadTools(base,kCMTimeZero).document[@"baseMasks"][@"hsl"][0],kCMTimeZero); - run.record(@"native-osc-mask-gesture-keeps-capture-when-crossing-the-open-viewer-panel",insideViewer&&fabs(p.centerX-(.5+130./560))<1e-5&&fabs(p.centerY-(.5+12.5/315))<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); + run.record(@"native-osc-mask-gesture-keeps-capture-when-crossing-the-open-viewer-panel",insideViewer&&fabs(p.centerX-(.5+190./560))<1e-5&&fabs(p.centerY-(.5+12.5/315))<1e-5&&base->_undoStarts==undo+1&&base->_undoEnds==undo+1); [osc release];[plugin release];drain(); } diff --git a/大鱼调色/Plugin/DYToolOSC.inc.h b/大鱼调色/Plugin/DYToolOSC.inc.h index be60048..5b81a30 100644 --- a/大鱼调色/Plugin/DYToolOSC.inc.h +++ b/大鱼调色/Plugin/DYToolOSC.inc.h @@ -21,7 +21,7 @@ _height=destination.imagePixelBounds.top-destination.imagePixelBounds.bottom;CGFloat canvasWidth=destination.imagePixelBounds.right-destination.imagePixelBounds.left;_canvasWidth=canvasWidth; idapi=[_apiManager apiForProtocol:@protocol(FxOnScreenControlAPI_v4)];double lx=0,ly=0,ux=0,uy=0;[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:0 fromY:0 toSpace:kFxDrawingCoordinates_CANVAS toX:&lx toY:&ly];[api convertPointFromSpace:kFxDrawingCoordinates_OBJECT fromX:1 fromY:1 toSpace:kFxDrawingCoordinates_CANVAS toX:&ux toY:&uy];_imageRect=NSMakeRect(lx,_height-uy,ux-lx,uy-ly);_uiScale=[api respondsToSelector:@selector(backingScaleFactor)]?MAX(1.,MIN(3.,[api backingScaleFactor])):1.;_toolbarRows=MAX(1,MIN(11,(NSInteger)floor((_height-MAX(8*_uiScale,_imageRect.origin.y+12*_uiScale)-8*_uiScale)/(39*_uiScale)))); DYPlugIn *plugin=[self pluginAtTime:time];NSDictionary *mask=[plugin toolCanvasMaskAtTime:time];NSInteger route=(plugin?1:0)+(mask?2:0);if(route!=_lastRoute||_drawCount++<2){_lastRoute=route;os_log(OS_LOG_DEFAULT,"dayu_tool_osc_route plugin=%{public}d mask=%{public}d width=%{public}.2f height=%{public}.2f",plugin!=nil,mask!=nil,_imageRect.size.width,_imageRect.size.height);}[_mask release];_mask=[mask copy];[_handles removeAllObjects];[_outline release];_outline=nil; - [_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time]; + [_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(canvasWidth,_height) scale:_uiScale atTime:time]; if(plugin&&canvasWidth>0&&_height>0&&canvasWidth<16384&&_height<16384&&_imageRect.size.width>0&&_imageRect.size.height>0){ NSBitmapImageRep *bitmap=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:NULL pixelsWide:(NSInteger)canvasWidth pixelsHigh:(NSInteger)_height bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:(NSInteger)canvasWidth*4 bitsPerPixel:32]autorelease];memset(bitmap.bitmapData,0,bitmap.bytesPerRow*bitmap.pixelsHigh);[NSGraphicsContext saveGraphicsState];[NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]];NSAffineTransform *flip=[NSAffineTransform transform];[flip translateXBy:0 yBy:_height];[flip scaleXBy:1 yBy:-1];[flip concat]; // Match AppKit text/image drawing to the top-down canvas CTM. @@ -52,16 +52,16 @@ for(NSDictionary *h in _handles){NSPoint q=[h[@"point"]pointValue];if(hypot(q.x-point.x,q.y-point.y)<=9*_uiScale)return [h[@"part"]integerValue];} if(p.kind==DYMaskBezier||p.kind==DYMaskLinearGradient||[_outline containsPoint:point])return 1;return 0; } -- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}} +- (void)hitTestOSCAtMousePositionX:(double)x mousePositionY:(double)y activePart:(NSInteger*)part atTime:(CMTime)time{@synchronized(self){DYPlugIn*plugin=[self pluginAtTime:time];[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSDictionary *fresh=[plugin toolCanvasMaskAtTime:time];[_mask release];_mask=[fresh copy];NSInteger hit=[self partAtPoint:NSMakePoint(x,_height-y)];if(part)*part=hit;if(_hitDiagnostics++<16)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_hit x=%{public}.2f y=%{public}.2f height=%{public}.2f rect=%{public}.2f,%{public}.2f,%{public}.2f,%{public}.2f mask=%{public}d hit=%{public}ld",x,y,_height,_imageRect.origin.x,_imageRect.origin.y,_imageRect.size.width,_imageRect.size.height,_mask!=nil,(long)hit);}} - (BOOL)event:(NSEventType)type x:(double)x y:(double)y part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {@synchronized(self){ - DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];if(type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0)return NO;NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];return YES; + DYPlugIn *plugin=[self pluginAtTime:time];if(_eventDiagnostics++<12)os_log(OS_LOG_DEFAULT,"dayu_tool_osc_event type=%{public}ld part=%{public}ld x=%{public}.2f y=%{public}.2f plugin=%{public}d",(long)type,(long)part,x,y,plugin!=nil);[_viewerControls setBridge:[plugin viewerParameterBridge]];[_viewerControls setViewport:_imageRect];[_viewerControls prepareWithSize:NSMakeSize(_canvasWidth,_height) scale:_uiScale atTime:time];NSPoint canvasPoint=NSMakePoint(x,_height-y);if(type==NSEventTypeKeyDown&&key==27&&[_viewerControls capturing])return [_viewerControls finishCapture];if(type!=NSEventTypeKeyDown&&[_viewerControls event:type point:canvasPoint atTime:time])return YES;if(!plugin||![plugin toolCanvasVisible]||_imageRect.size.width<=0||_imageRect.size.height<=0)return NO;NSPoint point=NSMakePoint((x-_imageRect.origin.x)/_imageRect.size.width,(_height-y-_imageRect.origin.y)/_imageRect.size.height);[plugin toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];return YES; }} - (void)mouseDownAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseDown x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (void)mouseDraggedAtPositionX:(double)x positionY:(double)y activePart:(NSInteger)part modifiers:(FxModifierKeys)m forceUpdate:(BOOL*)update atTime:(CMTime)t{BOOL result=[self event:NSEventTypeLeftMouseDragged x:x y:y part:part modifiers:m key:0 time:t];if(update)*update=result;} - (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 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?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 8dd54d4..396aca0 100644 --- a/大鱼调色/Plugin/DYViewerControls.inc.h +++ b/大鱼调色/Plugin/DYViewerControls.inc.h @@ -3,6 +3,7 @@ static const NSInteger DYViewerPartBase=20000; @interface DYViewerControls : NSObject @property(nonatomic,retain) DYViewerParameterBridge *bridge; +- (void)setViewport:(NSRect)viewport; - (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time; - (void)draw; - (NSInteger)partAtPoint:(NSPoint)point; @@ -14,7 +15,7 @@ static const NSInteger DYViewerPartBase=20000; @end @implementation DYViewerControls { DYViewerParameterBridge *_bridge;NSDictionary *_snapshot;NSArray *_nodes,*_rows;NSMutableArray *_areas; - NSString *_nodeID;NSSize _size;NSRect _panel;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft; + NSString *_nodeID;NSSize _size;NSRect _panel,_viewport;BOOL _hasViewport;CGFloat _scale;BOOL _open,_catalog,_dragging,_hasDraft; NSInteger _page,_catalogPage,_capacity,_catalogCapacity,_hover,_pressed;NSPoint _down;NSDictionary *_captured; double _draftValue,_downValue;CGFloat _knobOffset;CMTime _time,_downTime; } @@ -35,8 +36,9 @@ static const NSInteger DYViewerPartBase=20000; - (void)addArea:(NSRect)rect part:(NSInteger)part kind:(NSString*)kind title:(NSString*)title descriptor:(NSDictionary*)d index:(NSInteger)index{ NSMutableDictionary*a=[NSMutableDictionary dictionaryWithDictionary:@{@"rect":[NSValue valueWithRect:rect],@"part":@(part),@"kind":kind,@"title":title?:@"",@"index":@(index)}];if(d)a[@"descriptor"]=d;if([kind isEqual:@"module"]&&index<(NSInteger)_nodes.count)a[@"nodeID"]=_nodes[index][@"id"];[_areas addObject:a]; } -- (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time{ - _size=size;_scale=MAX(.6,MIN(MAX(1.,scale),MIN(size.width/360.,size.height/230.)));_time=time; +- (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;} [_snapshot release];_snapshot=[[_bridge snapshotAtTime:time]retain];NSDictionary*doc=_snapshot[@"document"]; NSMutableArray*nodes=[NSMutableArray array];NSMutableDictionary*counts=[NSMutableDictionary dictionary]; @@ -52,13 +54,13 @@ static const NSInteger DYViewerPartBase=20000; NSArray*sections=[type isEqual:@"base"]?@[@"color",@"base"]: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=MAX(margin,size.width-w-margin);_capacity=MAX(1,MIN(5,(NSInteger)floor((size.height-128*s)/(46*s)))); + 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; _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,margin,w,MIN(h,size.height-2*margin)); - [self addArea:NSMakeRect(x,margin,w,30*s) part:20000 kind:@"open" title:_open?@"画面调色 ▴":@"画面调色 ▾" descriptor:nil index:0];if(!_open)return; - CGFloat y=margin+36*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]; NSDictionary*enabled=[self descriptorForKey:[type isEqual:@"primary"]?@"primaryMasterEnabled":[type stringByAppendingString:@"Enabled"]]; if(enabled&&_snapshot)[self addArea:NSMakeRect(NSMaxX(_panel)-68*s,y,27*s,28*s) part:20003 kind:@"headerBool" title:[type isEqual:@"base"]?@"调":@"" descriptor:enabled index:0]; diff --git a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h index d64d262..499ed8d 100644 --- a/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYViewerControlsDiagnostics.inc.h @@ -48,5 +48,7 @@ for(NSDictionary*a in [controls valueForKey:@"areas"]){NSRect r=[a[@"rect"]rectValue];NSPoint center=NSMakePoint(NSMidX(r),NSMidY(r));if(center.x<0||center.y<0||center.x>=size.width||center.y>=size.height)bounded&=[controls partAtPoint:center]==0;} } run.record(@"viewer-controls-small-and-retina-canvases-never-hit-outside-visible-bounds",bounded); + [controls setViewport:NSMakeRect(40,30,560,315)];[controls prepareWithSize:NSMakeSize(640,400) scale:1 atTime:host->_time];NSRect anchored=[areaFor(@"open",nil)[@"rect"]rectValue]; + run.record(@"viewer-controls-entry-is-anchored-inside-the-host-image-not-letterbox",NSContainsRect(NSMakeRect(40,30,560,315),anchored)&&[controls partAtPoint:NSMakePoint(NSMidX(anchored),NSMidY(anchored))]==20000&&[controls partAtPoint:NSMakePoint(NSMidX(anchored),20)]==0); [controls finishCapture];controls.bridge=nil;[bridge invalidate];drain();[controls release];[bridge release]; } diff --git a/大鱼调色/Plugin/DYViewerControlsProbe.h b/大鱼调色/Plugin/DYViewerControlsProbe.h index ad4ad86..a842919 100644 --- a/大鱼调色/Plugin/DYViewerControlsProbe.h +++ b/大鱼调色/Plugin/DYViewerControlsProbe.h @@ -1,6 +1,7 @@ #pragma once @protocol DYViewerControlsProbe @property(nonatomic,retain) id bridge; +- (void)setViewport:(NSRect)viewport; - (void)prepareWithSize:(NSSize)size scale:(CGFloat)scale atTime:(CMTime)time; - (NSInteger)partAtPoint:(NSPoint)point; - (BOOL)event:(NSEventType)type point:(NSPoint)point atTime:(CMTime)time; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 0989b7c..5e82e02 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.9.0 CFBundleVersion - 68 + 69 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index f6502a3..d6ef59d 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.9.0 CFBundleVersion - 68 + 69 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright