From f9dea76a453319abceaff2d66ba401d30ae10468 Mon Sep 17 00:00:00 2001 From: mac Date: Mon, 2 Nov 2026 21:42:20 +0800 Subject: [PATCH] Respect FxRemoteWindow geometry and follow host content bounds in LUT browser --- Packaging/Release-1.7.2.md | 7 ++ research/BrowserRemoteGeometry1.7.2.md | 23 +++++ tools/verify_browser_customization.mm | 2 +- tools/verify_browser_remote_geometry.mm | 62 +++++++++++++ verification/BrowserCustomization.json | 2 +- .../BrowserGeometryRegression1.7.2.json | 21 +++++ verification/BrowserRemoteGeometry1.7.2.json | 90 +++++++++++++++++++ 大鱼调色/Plugin/DYDiagnostics.mm | 21 +++++ 大鱼调色/Plugin/DYLUTBrowser.mm | 37 ++++++-- 大鱼调色/Plugin/Info.plist | 6 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 11 files changed, 261 insertions(+), 14 deletions(-) create mode 100644 Packaging/Release-1.7.2.md create mode 100644 research/BrowserRemoteGeometry1.7.2.md create mode 100644 tools/verify_browser_remote_geometry.mm create mode 100644 verification/BrowserGeometryRegression1.7.2.json create mode 100644 verification/BrowserRemoteGeometry1.7.2.json diff --git a/Packaging/Release-1.7.2.md b/Packaging/Release-1.7.2.md new file mode 100644 index 0000000..73e0446 --- /dev/null +++ b/Packaging/Release-1.7.2.md @@ -0,0 +1,7 @@ +# 大鱼调色 1.7.2(47) + +修正风格LUT缩略图浏览库的远程窗口尺寸处理:按FCP提供的实际内容区域布局,避免用本地保存的位置、尺寸和min/max覆盖宿主窗口;容器变更时同步填充深色内容区。缩略图大小、列表/网格、侧栏、分类和最近使用继续保留。 + +本地脱离式窗口使用系统实际标题栏尺寸,并把恢复位置约束到当前显示器。保留1.7.1的Cube文字行兼容。 + +要求Apple Silicon、macOS14.6或更新,唯一位置`/Library/Plug-Ins/FxPlug/大鱼调色.app`。本机宿主为FCP12.4;反馈来自FCP12.3/系统27.01,目标机显示器配置未知,目标版本仍需更新后复测。测试和交付结果见本轮verification记录。 diff --git a/research/BrowserRemoteGeometry1.7.2.md b/research/BrowserRemoteGeometry1.7.2.md new file mode 100644 index 0000000..f78fcba --- /dev/null +++ b/research/BrowserRemoteGeometry1.7.2.md @@ -0,0 +1,23 @@ +# 1.7.2:LUT浏览库远程窗口尺寸 + +基线 `e62d5532f2360d157d5a4d96488e58f4113a55af`,正式安装1.7.1(46)。用户转述另一使用者的“窗口很大、出现灰色空白、深色内容被裁切”,并提供第三方源码分析;版本为FCP12.3、系统输入为27.01(按27.0.1记录),分辨率及缩放未知。本机为FCP12.4,不能把本机验证写成对方12.3实测。 + +## 已确认的代码问题与分析边界 + +`DYInspector`优先请求FxRemoteWindowAPI_v3/v2,并同步把浏览器根视图接入SDK提供的parent。随后`configurePresentationWindow`原先还会修改`_root.window`的最小/最大内容尺寸、标题和frame,恢复插件自行保存的位置。远程桥接窗口的几何不应由这条本地恢复逻辑覆盖。 + +本机FxPlug4.3.5的`FxRemoteWindowAPI.h`说明v2的最大尺寸会限制到宿主**窗口**大小的80%。它没有说按检视器宽度限制;固定28点标题栏换算不准确,也不能单凭不同常量认定每台机器必然出现灰边。多屏时机、FCP12.3具体桥接行为及对方真实灰边仍需目标机复核。 + +隐藏AppKit桥接模型从相同内容大小开始,关闭parent自动调整子视图,种入离屏/大屏历史记录。旧源码失败9项:宿主frame/min/max/标题被改、桥接缩放策略被覆盖、若干parent变化未跟随、非零bounds原点未跟随、远程窗口事件污染本地历史。修正后21项几何检查、23项浏览库回归通过,摘要见`verification/BrowserGeometryRegression1.7.2.json`。测试模型的失败证明不安全路径,不冒充对方系统的实际截图复现。 + +## 修改 + +- 远程模式仅观察生命周期并按parent.bounds布局,直接返回;不设宿主窗口frame、min/max、标题、位置或背景,不从本地历史恢复远程窗口。 +- 保留桥接容器自己的autoresizesSubviews设置;监听parent的frame/bounds变化,即使自动缩放关闭、初始零尺寸或bounds原点非零,根视图也填满实际可用区域。关闭后移除这些观察。 +- 远程窗口事件不再写插件的本地frame偏好;缩略图大小、布局、分类、侧栏和最近使用保留原机制。 +- 仅本地脱离式弹窗保留位置恢复,用AppKit实际frame/content转换取代固定28/448/1228点;按保存frame与显示器的交集选择可用屏幕,将内容和外框约束到真实可见区域。 +- SDK v2/v3仍负责可调整远程窗口的范围;不通过改min/max伪装初始尺寸,也不清空用户配置来掩盖问题。 + +`tools/verify_browser_remote_geometry.mm`覆盖576×336、720×420、1280×800、900×620等桥接内容大小、旧记录、禁用自动缩放、非零原点、晚到尺寸、一次关闭和本地窗口恢复。正式`--self-test`加入8项对应检查。所有构建目录窗口测试保持不可见;用户可见验证只运行正式签名、公证并安装的版本。 + +本轮继续保留1.7.1的Cube文字行容错。最终公证、宿主、安装包和Release结果以交付记录为准;目标使用者的FCP12.3仍需更新后复测。 diff --git a/tools/verify_browser_customization.mm b/tools/verify_browser_customization.mm index 1a4c5d6..1fc674b 100644 --- a/tools/verify_browser_customization.mm +++ b/tools/verify_browser_customization.mm @@ -32,7 +32,7 @@ int main(int argc,const char **argv){@autoreleasepool{ NSSplitView *split=[browser valueForKey:@"splitView"];[split setPosition:240 ofDividerAtIndex:0];[browser layoutBrowser];NSScrollView *folders=[browser valueForKey:@"folderScroll"],*grid=[browser valueForKey:@"gridScroll"];require(fabs(folders.frame.size.width-240)<2&&NSMaxX(folders.frame)<=NSMinX(grid.frame),@"sidebar divider changes folder width without overlapping previews"); [browser close];[browser release];browser=[[DYLUTBrowser alloc]initWithLibrary:library preview:nil selectedPath:nil palette:@{} selection:nil];pump(^{return [browser valueForKey:@"libraryTask"]==nil;});require([(NSPopUpButton*)[browser valueForKey:@"layoutMenu"]indexOfSelectedItem]==1&&fabs([[browser valueForKey:@"sidebarWidth"]doubleValue]-240)<2,@"layout and sidebar width survive reopening"); NSPanel *host=[[[NSPanel alloc]initWithContentRect:NSMakeRect(120,160,900,620) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO]autorelease];__block int closes=0;[browser showInRemoteParent:host.contentView close:^{closes++;}];pump(^{return [browser valueForKey:@"presentationWindow"]==host;});require(!host.visible&&browser.visible,@"remote-parent checks never display a test window"); - NSRect desired=NSMakeRect(190,210,1000,680);[host setFrame:desired display:NO];NSString *frameKey=[@"com.dayu.color.lookLUTPreview.windowFrame|" stringByAppendingString:library.rootURL.path];require(NSEqualRects(NSRectFromString([NSUserDefaults.standardUserDefaults stringForKey:frameKey]),host.frame),@"window position and size are remembered");[browser close];[browser close];require(closes==1,@"remote close callback runs once");[browser release];[ack release];ack=nil; + NSRect desired=NSMakeRect(190,210,1000,680);[host setFrame:desired display:NO];NSString *frameKey=[@"com.dayu.color.lookLUTPreview.windowFrame|" stringByAppendingString:library.rootURL.path];require([NSUserDefaults.standardUserDefaults stringForKey:frameKey]==nil,@"remote window geometry is owned and remembered by the host");[browser close];[browser close];require(closes==1,@"remote close callback runs once");[browser release];[ack release];ack=nil; for(int i=0;i<50;i++)[library recordUsedPath:[root.path stringByAppendingPathComponent:[NSString stringWithFormat:@"History-%d.cube",i]]];require(library.recentPaths.count==40&&[library.recentPaths[0]hasSuffix:@"History-49.cube"],@"recent history stays bounded at 40 newest paths"); NSArray *keys=NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys;for(NSString *key in keys)if([key containsString:library.rootURL.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key];require([fm removeItemAtURL:root error:nil],@"isolated fixtures and preferences cleaned"); NSDictionary *report=@{@"pass":@YES,@"checks":checks,@"scope":@"Real AppKit browser objects, hidden host-owned window fixture, asynchronous acknowledgement and root-scoped history; no visible test app or user LUT changes."};[[NSJSONSerialization dataWithJSONObject:report options:NSJSONWritingPrettyPrinted error:nil]writeToFile:[NSString stringWithUTF8String:argv[1]] atomically:YES];printf("PASS %lu browser checks\n",(unsigned long)checks.count);[checks release];return 0; diff --git a/tools/verify_browser_remote_geometry.mm b/tools/verify_browser_remote_geometry.mm new file mode 100644 index 0000000..a769152 --- /dev/null +++ b/tools/verify_browser_remote_geometry.mm @@ -0,0 +1,62 @@ +#import +#import "../大鱼调色/Plugin/DYLUTBrowser.h" +#import "../大鱼调色/Plugin/DYLUTLibrary.h" +#include + +@interface DYLUTBrowser (GeometryProbe) +- (void)configurePresentationWindow; +@end +static NSMutableArray *checks; +static void check(BOOL pass,NSString *name){[checks addObject:@{@"name":name,@"pass":@(pass)}];if(!pass)fprintf(stderr,"FAIL %s\n",name.UTF8String);} +static void pump(void){double until=NSProcessInfo.processInfo.systemUptime+.08;while(NSProcessInfo.processInfo.systemUptime @@ -198,6 +199,26 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { DYAssetState *copy=[[assets copy]autorelease];copy.paths=@{};run.record(@"asset-copy-is-independent",assets.paths.count==2&©.paths.count==0); // Exercise the real AppKit actions against a separate, in-memory host. [NSApplication sharedApplication]; + DYLUTLibrary *geometryLibrary=[[[DYLUTLibrary alloc]initWithRootURL:[NSURL fileURLWithPath:[runtime stringByAppendingPathComponent:@"browser-geometry"]]]autorelease]; + NSString *geometryKey=[@"com.dayu.color.lookLUTPreview.windowFrame|" stringByAppendingString:geometryLibrary.rootURL.path],*staleGeometry=NSStringFromRect(NSMakeRect(-9000,8000,1800,1228)); + [NSUserDefaults.standardUserDefaults setObject:staleGeometry forKey:geometryKey]; + NSPanel *geometryHost=[[[NSPanel alloc]initWithContentRect:NSMakeRect(80,100,900,620) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO]autorelease]; + NSView *geometryParent=[[[NSView alloc]initWithFrame:geometryHost.contentView.bounds]autorelease];geometryParent.autoresizesSubviews=NO;[geometryHost.contentView addSubview:geometryParent]; + NSRect geometryFrame=geometryHost.frame;NSSize geometryMin=geometryHost.contentMinSize,geometryMax=geometryHost.contentMaxSize; + __block NSUInteger geometryCloses=0;DYLUTBrowser *geometryBrowser=[[[DYLUTBrowser alloc]initWithLibrary:geometryLibrary preview:nil selectedPath:nil palette:@{} selection:nil]autorelease]; + [geometryBrowser showInRemoteParent:geometryParent close:^{geometryCloses++;}];double geometryDeadline=NSProcessInfo.processInfo.systemUptime+2; + while([geometryBrowser valueForKey:@"presentationWindow"]!=geometryHost&&NSProcessInfo.processInfo.systemUptime=720&&frame.size.height>=420){ - NSRect screen=(window.screen?:NSScreen.mainScreen).visibleFrame;frame.size.width=MIN(MAX(720,frame.size.width),MIN(1800,screen.size.width));frame.size.height=MIN(MAX(448,frame.size.height),MIN(1228,screen.size.height)); - frame.origin.x=MAX(NSMinX(screen),MIN(frame.origin.x,NSMaxX(screen)-frame.size.width));frame.origin.y=MAX(NSMinY(screen),MIN(frame.origin.y,NSMaxY(screen)-frame.size.height));[window setFrame:frame display:YES]; + NSScreen *target=window.screen?:NSScreen.mainScreen;CGFloat largest=0; + for(NSScreen *candidate in NSScreen.screens){NSRect overlap=NSIntersectionRect(frame,candidate.visibleFrame);CGFloat area=overlap.size.width*overlap.size.height;if(area>largest){largest=area;target=candidate;}} + if(target){ + NSRect screen=target.visibleFrame;NSSize available=[window contentRectForFrameRect:screen].size,minimum=self.class.minimumContentSize,maximum=self.class.maximumContentSize; + minimum=NSMakeSize(MIN(minimum.width,available.width),MIN(minimum.height,available.height));maximum=NSMakeSize(MIN(maximum.width,available.width),MIN(maximum.height,available.height)); + window.contentMinSize=minimum;window.contentMaxSize=maximum; + NSRect content=[window contentRectForFrameRect:frame];content.size=NSMakeSize(MIN(maximum.width,MAX(minimum.width,content.size.width)),MIN(maximum.height,MAX(minimum.height,content.size.height)));frame=[window frameRectForContentRect:content]; + frame.origin.x=MAX(NSMinX(screen),MIN(frame.origin.x,NSMaxX(screen)-frame.size.width));frame.origin.y=MAX(NSMinY(screen),MIN(frame.origin.y,NSMaxY(screen)-frame.size.height));[window setFrame:frame display:YES]; + } } [self layoutBrowser]; } - (void)presentationGeometryChanged:(NSNotification *)notification{ - if(_closed||!_presentationWindow)return;NSRect frame=_presentationWindow.frame; + if(_closed||!_presentationWindow)return;if(_remoteMode){[self fitRemoteParent];return;}NSRect frame=_presentationWindow.frame; if(std::isfinite(frame.size.width)&&std::isfinite(frame.size.height)&&frame.size.width>=720&&frame.size.height>=420)[NSUserDefaults.standardUserDefaults setObject:NSStringFromRect(frame) forKey:DYBrowserPreference(DYBrowserFramePreference,_library)]; [self layoutBrowser]; } @@ -272,6 +294,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [NSObject cancelPreviousPerformRequestsWithTarget:self]; _closed=YES;_visible=NO;_work.cancelled=YES;_work.owner=nil;[_libraryTask cancel];[_selectionTask cancel];[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil; _popover.delegate=nil;if(_popover.shown)[_popover close]; + if(_remoteMode&&_root.superview)for(NSNotificationName name in @[NSViewFrameDidChangeNotification,NSViewBoundsDidChangeNotification])[[NSNotificationCenter defaultCenter]removeObserver:self name:name object:_root.superview]; [_root removeFromSuperview];[_queuedPaths removeAllObjects];[_thumbnailCache removeAllObjects]; [_selection release];_selection=nil; void (^closeAction)(void)=[_closeAction copy];[_closeAction release];_closeAction=nil; diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 3a8b85d..ed80f4a 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.7.1 + 1.7.2 CFBundleVersion - 46 + 47 NSHumanReadableCopyright PlugInKit @@ -71,7 +71,7 @@ uuid 1C17B73B-F229-4C09-A434-EAF6DFF5F22A version - 1.7.1 + 1.7.2 className diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 0347c1a..f5263e8 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.7.1 + 1.7.2 CFBundleVersion - 46 + 47 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright