From beccf2fc01f8dc06c5d3d505f88289885d209bc8 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 5 Nov 2026 12:25:26 +0800 Subject: [PATCH] feat: add recent LUT shortcuts and move canvas controls to the lower corners --- 大鱼调色/Plugin/DYDiagnostics.mm | 10 +++++ 大鱼调色/Plugin/DYInspector.mm | 22 ++++++++-- 大鱼调色/Plugin/DYLUTBrowser.h | 4 ++ 大鱼调色/Plugin/DYLUTBrowser.mm | 43 +++++++++++++++---- 大鱼调色/Plugin/DYViewerControls.inc.h | 16 +++---- .../Plugin/DYViewerControlsDiagnostics.inc.h | 8 ++-- 大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h | 1 + 大鱼调色/Plugin/Info.plist | 2 +- 大鱼调色/Wrapper Application/Info.plist | 2 +- 9 files changed, 83 insertions(+), 25 deletions(-) diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 9d2bf4d..965e670 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -251,6 +251,16 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { [serviceContent setFrameOrigin:NSMakePoint(123,77)]; run.record(@"browser-remote-later-content-origin-is-repaired",NSEqualRects([serviceRoot convertRect:serviceRoot.bounds toView:nil],serviceViewport)); run.record(@"browser-remote-origin-repair-keeps-host-frame-and-hidden-fixture",NSEqualRects(serviceGeometry.frame,serviceFrame)&&!serviceGeometry.visible);[serviceBrowser close]; + NSString *recentA=[geometryLibrary.rootURL.path stringByAppendingPathComponent:@"first.cube"],*recentB=[geometryLibrary.rootURL.path stringByAppendingPathComponent:@"second.cube"]; + [geometryLibrary recordUsedPath:recentA];[geometryLibrary recordUsedPath:recentB]; + NSString *fullFolderKey=[@"com.dayu.color.lookLUTPreview.selectedFolder|" stringByAppendingString:geometryLibrary.rootURL.path]; + [NSUserDefaults.standardUserDefaults setObject:@"*" forKey:fullFolderKey];id originalFolder=[NSUserDefaults.standardUserDefaults objectForKey:fullFolderKey]; + NSView *recentParent=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,424,150)]autorelease]; + DYLUTBrowser *recentBrowser=[[[DYLUTBrowser alloc]initWithLibrary:geometryLibrary preview:nil selectedPath:recentA palette:@{} selection:nil]autorelease];[recentBrowser embedRecentInView:recentParent]; + NSView *recentRoot=[recentBrowser valueForKey:@"root"];NSScrollView *recentGrid=[recentBrowser valueForKey:@"gridScroll"]; + run.record(@"recent-lut-shortcuts-reuse-adaptive-grid-without-browser-chrome",recentBrowser.visible&&recentGrid.superview==recentRoot&&NSContainsRect(recentRoot.bounds,recentGrid.frame)&&!recentGrid.hasHorizontalScroller&&[(NSView*)[recentBrowser valueForKey:@"splitView"]isHidden]&&[(NSView*)[recentBrowser valueForKey:@"search"]isHidden]); + [geometryLibrary recordUsedPath:recentA];[recentBrowser refreshRecentSelection:recentA];NSArray *recentEntries=[recentBrowser valueForKey:@"visibleEntries"]; + run.record(@"recent-lut-refresh-follows-acknowledged-history-and-preserves-browser-preference",recentEntries.count==2&&[recentEntries[0][@"path"]isEqual:recentA]&&(!originalFolder?[NSUserDefaults.standardUserDefaults objectForKey:fullFolderKey]==nil:[originalFolder isEqual:[NSUserDefaults.standardUserDefaults objectForKey:fullFolderKey]]));[recentBrowser close]; for(NSString *key in NSUserDefaults.standardUserDefaults.dictionaryRepresentation.allKeys)if([key containsString:geometryLibrary.rootURL.path])[NSUserDefaults.standardUserDefaults removeObjectForKey:key]; DYDiagnosticManager *uiHost=[[[DYDiagnosticManager alloc]init]autorelease];DYCreateParameters(uiHost,nil); DYInspector *inspector=[[[DYInspector alloc]initWithAPIManager:uiHost]autorelease];[inspector refresh]; diff --git a/大鱼调色/Plugin/DYInspector.mm b/大鱼调色/Plugin/DYInspector.mm index 754470c..3565659 100644 --- a/大鱼调色/Plugin/DYInspector.mm +++ b/大鱼调色/Plugin/DYInspector.mm @@ -480,6 +480,7 @@ NSView *DYCreateWorkspaceMaskEditor(id DYRenderer *_renderer; DYLUTLibrary *_library; DYLUTBrowser *_browser; + DYLUTBrowser *_recentBrowser;DYFlippedView *_recentHost; DYColorWorkspace *_workspace;NSButton *_workspaceButton;NSString *_workspaceSelectedNode; NSArray *_themeButtons; NSMutableDictionary *_tabs; @@ -572,6 +573,7 @@ NSView *DYCreateWorkspaceMaskEditor(id if(_embedded)[(id)_manager release];[_stackViews release];[_stackOrder release];[_stackRoots release]; [_brand release]; [_subtitle release]; [_websiteLink release]; [_resetAll release]; [_save release]; [_load release]; [_export release];[_colorSettings release];[_addModule release]; [_managedPanel release];[_scroll release]; [_document release]; [_sections release]; [_cards release]; [_controls release]; [_assetButtons release]; [_graphics release]; [_sampler release]; + [_recentBrowser close];[_recentBrowser release];[_recentHost release]; [_browser close];[_browser release];[_renderer release];[_library release];[_themeButtons release];[_tabs release];[_graphicExpected release]; [super dealloc]; } @@ -620,7 +622,7 @@ NSView *DYCreateWorkspaceMaskEditor(id 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]; for(NSDictionary *r in _controls.allValues)[r[@"field"] setBackgroundColor:DYThemeColor(@"field")]; - [_browser updatePalette:DYThemePalette()];[_workspace updatePalette];[self redrawTree:self]; + [_browser updatePalette:DYThemePalette()];[_recentBrowser updatePalette:DYThemePalette()];[_workspace updatePalette];[self redrawTree:self]; } - (void)tabChanged:(NSControl *)sender { if([sender isKindOfClass:NSSegmentedControl.class])_tabs[sender.identifier]=@([(NSSegmentedControl *)sender selectedSegment]); @@ -628,7 +630,7 @@ NSView *DYCreateWorkspaceMaskEditor(id [self setNeedsLayout:YES];NSAccessibilityPostNotification(self,NSAccessibilityLayoutChangedNotification); } - (void)addLook:(id)sender {_visibleLooks=MIN(5,_visibleLooks+1);[self setNeedsLayout:YES];} -- (void)previewChanged:(NSNotification *)note {for(id graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class])[graphic setHistogram:[_renderer histogram]];[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];} +- (void)previewChanged:(NSNotification *)note {for(id graphic in _graphics)if([graphic isKindOfClass:DYCurvePanel.class])[graphic setHistogram:[_renderer histogram]];[_managedPanel refreshContext];if(_browser.visible)[_browser updatePreview:[_renderer lookLUTPreview]];if(_recentBrowser.visible)[_recentBrowser updatePreview:[_renderer lookLUTPreview]];} - (void)buildCards { NSInteger index=0; for(NSDictionary *section in _sections) { @@ -741,6 +743,12 @@ NSView *DYCreateWorkspaceMaskEditor(id for(NSView *row in body)if([row.identifier isEqual:strength])[ordered addObject:row]; } for(NSView *row in body)if(![ordered containsObject:row])row.hidden=YES;body=ordered; + if(_workspaceEditor){ + _recentHost=[[DYFlippedView alloc]initWithFrame:NSMakeRect(12,80,600,160)];_recentHost.identifier=@"recentLUTs";[card addSubview:_recentHost]; + __block DYInspector *owner=self; + _recentBrowser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:nil palette:DYThemePalette() selection:^NSProgress *(NSString *path,void (^completion)(NSError *)){return [owner setAssetPath:path forKey:@"look0" completion:completion];}]; + [_recentBrowser embedRecentInView:_recentHost]; + } } NSMutableDictionary *record=[NSMutableDictionary dictionaryWithDictionary:@{@"section":section,@"view":card,@"header":header,@"enabled":enabled,@"reset":reset,@"body":body,@"collapsed":@YES}]; if([key isEqual:@"look"]){NSButton *add=DYButton(@"+",self,@selector(addLook:));add.bordered=NO;add.font=[NSFont boldSystemFontOfSize:20];add.accessibilityLabel=@"添加风格 LUT";[card addSubview:add];record[@"add"]=add;} @@ -839,6 +847,12 @@ NSView *DYCreateWorkspaceMaskEditor(id CGFloat groupWidth=MAX(490,available);_spiderPanel.frame=NSMakeRect(x,0,groupWidth,height); for(NSView *row in rows)if([row.identifier isEqual:@"spiderMix"]){[_spiderPanel addSubview:row];_spiderPanel.accessoryRow=row;} [_spiderPanel setNeedsLayout:YES];[_spiderPanel layoutSubtreeIfNeeded];x+=groupWidth; + }else if([key isEqual:@"look"]&&_recentHost){ + NSInteger perColumn=MAX(2,NSInteger(floor(MAX(68,height-140)/34))),columns=MAX(1,NSInteger(ceil(double(rows.count)/perColumn))); + CGFloat rw=MAX(280,(available-16*(columns-1))/columns);NSInteger index=0; + for(NSView *row in rows){row.frame=NSMakeRect(x+(index/perColumn)*(rw+16),(index%perColumn)*34,rw,33);index++;} + CGFloat width=columns*rw+16*(columns-1),top=MIN(perColumn,NSInteger(rows.count))*34+12; + _recentHost.frame=NSMakeRect(x,top,width,MAX(70,height-top));x+=width; }else{ CGFloat top=0; if(tabs){tabs.frame=NSMakeRect(x,4,available,30);NSInteger index=0;CGFloat sw=available/9;for(NSView *button in tabs.subviews)button.frame=NSMakeRect(index++*sw,1,sw-5,27);top=46;} @@ -883,7 +897,7 @@ NSView *DYCreateWorkspaceMaskEditor(id id action=[self actionAPI]; if(!action)return; _refreshing=YES; uint64_t beta=DYBetaSpanBegin(@"inspector_refresh",nil); - BOOL groupingChanged=NO; + BOOL groupingChanged=NO;NSString *recentPath=nil; [action startAction:self]; @try { CMTime t=action.currentTime; @@ -943,9 +957,11 @@ NSView *DYCreateWorkspaceMaskEditor(id [_assetButtons[key][@"remove"] setEnabled:path.length>0]; NSButton *eye=_assetButtons[key][@"eye"];if(eye){NSInteger slot=[[key substringFromIndex:4]integerValue];double enabled=1;[get getFloatValue:&enabled fromParameter:2040+(UInt32)slot-1 atTime:t];eye.state=enabled>=.5?NSControlStateValueOn:NSControlStateValueOff;eye.image=[NSImage imageWithSystemSymbolName:enabled>=.5?@"eye":@"eye.slash" accessibilityDescription:enabled>=.5?@"启用":@"旁路"];} } + if(_recentBrowser)recentPath=[assets.paths[@"look0"]copy]; for(NSInteger i=1;i<5;i++)if([assets.paths[[NSString stringWithFormat:@"look%ld",(long)i]]length])_visibleLooks=MAX(_visibleLooks,i+1); [self setNeedsLayout:YES]; } @finally { [action endAction:self]; _refreshing=NO; } + [_recentBrowser refreshRecentSelection:recentPath];[recentPath release]; // Remote layout/accessibility can re-enter the host. Let the parameter // action and current callback unwind before notifying the remote view. if(!_embedded&&!_workspaceEditor)[self synchronizeTools]; diff --git a/大鱼调色/Plugin/DYLUTBrowser.h b/大鱼调色/Plugin/DYLUTBrowser.h index 491aad1..8e6ce39 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.h +++ b/大鱼调色/Plugin/DYLUTBrowser.h @@ -22,6 +22,10 @@ typedef NSProgress * (^DYLUTSelectionHandler)(NSString *path,void (^completion)( /// Embedded content inside another remote tool workspace. It follows only the /// supplied container and does not take ownership of the enclosing window. - (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction; +/// Lightweight recent shortcuts using the same thumbnail and selection pipeline. +/// Does not change the full browser's saved folder, grid size or layout. +- (void)embedRecentInView:(NSView *)parent; +- (void)refreshRecentSelection:(NSString *)path; - (void)updatePalette:(NSDictionary *)palette; /// Replace the source frame after the renderer captures a new playhead image. /// Passing identical bytes keeps the current thumbnail jobs and cache intact. diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index f85276f..7ef55cb 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -82,6 +82,7 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){ @property BOOL chosen; @property BOOL doubleClicked; @property BOOL listLayout; +@property BOOL shortcut; @end @implementation DYBrowserTile - (BOOL)isFlipped{return YES;} @@ -92,7 +93,7 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){ - (void)dealloc{[_thumbnail release];[_displayName release];[_failure release];[_palette release];[super dealloc];} - (NSString *)accessibilityLabel{return _displayName?:@"LUT";} - (id)accessibilityValue{return _chosen?@"已选择":_failure.length?@"LUT 无效":_thumbnail?@"可应用":@"正在生成缩略图";} -- (NSString *)accessibilityHelp{return _failure?:@"单击应用此 LUT,双击应用并关闭浏览器";} +- (NSString *)accessibilityHelp{return _failure?:_shortcut?@"点击将此 LUT 应用到当前风格图层":@"单击应用此 LUT,双击应用并关闭浏览器";} - (void)drawRect:(NSRect)dirty{ NSRect bounds=NSInsetRect(self.bounds,1,1); NSBezierPath *outline=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:7 yRadius:7]; @@ -163,7 +164,8 @@ static void DYBrowserGeometrySample(NSView *root,NSString *phase){ NSCache *_thumbnailCache; dispatch_queue_t _previewQueue; DYBrowserWork *_work; - BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached,_embedded; + BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached,_embedded,_compactRecent; + NSArray *_recentSnapshot; NSProgress *_libraryTask,*_selectionTask; NSTimer *_progressTimer; NSUInteger _libraryGeneration,_selectionGeneration; @@ -233,6 +235,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b return self; } - (void)dealloc{ + [_recentSnapshot release]; [NSObject cancelPreviousPerformRequestsWithTarget:self];[[NSNotificationCenter defaultCenter]removeObserver:self]; [_libraryTask cancel];[_libraryTask release];[_selectionTask cancel];[_selectionTask release];[_progressTimer invalidate];[_progressTimer release]; _work.cancelled=YES;_work.owner=nil;[_work release];self.window.delegate=nil; @@ -274,6 +277,23 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (void)embedInView:(NSView *)parent close:(void (^)(void))closeAction{ _embedded=YES;_folderScroll.hasVerticalScroller=YES;_gridScroll.hasVerticalScroller=YES;_gridScroll.hasHorizontalScroller=NO;_gridScroll.scrollerStyle=NSScrollerStyleOverlay;[self showInRemoteParent:parent close:closeAction];_done.title=@"返回调整"; } +- (void)embedRecentInView:(NSView *)parent{ + _compactRecent=YES;_embedded=YES; + [_folder release];_folder=[DYBrowserRecentFolder copy]; + _root.accessibilityLabel=@"最近使用 LUT 快捷入口"; + _titleLabel.stringValue=@"最近使用";_titleLabel.font=[NSFont systemFontOfSize:11 weight:NSFontWeightSemibold]; + [_layoutMenu selectItemAtIndex:0];_sizeSlider.doubleValue=120; + for(NSView *view in @[_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_sizeLabel,_sizeSlider,_layoutMenu,_splitView])view.hidden=YES; + [_root addSubview:_gridScroll];_gridScroll.hasHorizontalScroller=NO;_gridScroll.scrollerStyle=NSScrollerStyleOverlay; + [self showInRemoteParent:parent close:nil];[self refreshRecentSelection:_selectedPath]; +} +- (void)refreshRecentSelection:(NSString *)path{ + if(!_compactRecent||_closed)return; + if(![_selectedPath isEqualToString:path]){NSString *next=[path copy];[_selectedPath release];_selectedPath=next;} + NSArray *paths=_library.recentPaths; + if(![_recentSnapshot isEqual:paths]){[_recentSnapshot release];_recentSnapshot=[paths copy];[self rebuildGrid];} + for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=[tile.identifier isEqualToString:_selectedPath];[tile setNeedsDisplay:YES];} +} - (void)fitRemoteParent{ NSView *parent=_root.superview;if(_closed||!_remoteMode||!parent)return; // A scaled-display ViewBridge service can hand us its top-level content @@ -358,6 +378,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (void)layoutBrowser{ if(_layingOut)return;_layingOut=YES; CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; + if(!_compactRecent){ _titleLabel.frame=NSMakeRect(14,12,160,20);_countLabel.frame=NSMakeRect(180,14,120,18); _search.frame=NSMakeRect(14,46,MAX(125,w-350),24); _importFiles.frame=NSMakeRect(w-322,44,100,28);_importFolder.frame=NSMakeRect(w-218,44,113,28);_refresh.frame=NSMakeRect(w-101,44,82,28); @@ -367,7 +388,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b _sizeLabel.frame=NSMakeRect(211,h-39,74,18);_sizeSlider.frame=NSMakeRect(288,h-41,MIN(150,MAX(80,w-550)),20); _done.frame=NSMakeRect(w-98,h-44,78,27); CGFloat statusX=NSMaxX(_sizeSlider.frame)+14;_statusLabel.frame=NSMakeRect(statusX,h-39,MAX(0,w-statusX-112),18); - if(_embedded){ + if(_embedded&&!_compactRecent){ _search.frame=NSMakeRect(12,36,MAX(125,w-310),24); _importFiles.frame=NSMakeRect(w-284,34,88,28);_importFolder.frame=NSMakeRect(w-192,34,100,28);_refresh.frame=NSMakeRect(w-88,34,76,28); _splitView.frame=NSMakeRect(8,68,MAX(1,w-16),MAX(1,h-108));[_splitView adjustSubviews]; @@ -376,9 +397,15 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b BOOL small=w<650;_sizeLabel.hidden=small;_sizeSlider.hidden=small;_statusLabel.hidden=small; if(!small){_sizeLabel.frame=NSMakeRect(174,h-29,68,18);_sizeSlider.frame=NSMakeRect(246,h-31,100,20);_statusLabel.frame=NSMakeRect(354,h-29,MAX(0,w-454),18);} } - CGFloat fw=MAX(100,_folderScroll.contentSize.width); + } + if(_compactRecent){ + _titleLabel.frame=NSMakeRect(0,2,92,18);_countLabel.frame=NSMakeRect(94,2,100,18); + _statusLabel.hidden=NO;_statusLabel.frame=NSMakeRect(0,MAX(24,h-19),MAX(0,w),18); + _gridScroll.frame=NSMakeRect(0,26,MAX(1,w),MAX(1,h-49)); + } + if(!_compactRecent){CGFloat fw=MAX(100,_folderScroll.contentSize.width); _folderDocument.frame=NSMakeRect(0,0,fw,MAX(_folderPaths.count*35+4,_folderScroll.contentSize.height)); - [self updateVisibleFolders]; + [self updateVisibleFolders];} CGFloat available=MAX(80,_gridScroll.contentSize.width),tileWidth=_sizeSlider.doubleValue,gap=10; BOOL list=_layoutMenu.indexOfSelectedItem==1;NSInteger columns=list?1:MAX(1,(NSInteger)floor((available+gap)/(tileWidth+gap)));tileWidth=list?MAX(110,available-14):MIN(tileWidth,(available-gap*(columns-1)-14)/columns);tileWidth=MAX(70,tileWidth); _columns=columns;_tileWidth=tileWidth;_tileHeight=list?70:ceil(tileWidth*9/16)+24; @@ -389,7 +416,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b - (CGFloat)splitView:(NSSplitView *)split constrainMinCoordinate:(CGFloat)proposed ofSubviewAt:(NSInteger)index{return 128;} - (CGFloat)splitView:(NSSplitView *)split constrainMaxCoordinate:(CGFloat)proposed ofSubviewAt:(NSInteger)index{return MIN(360,split.bounds.size.width*.45);} - (void)splitViewDidResizeSubviews:(NSNotification *)notification{ - if(_closed||_layingOut)return;_sidebarWidth=_folderScroll.frame.size.width;[NSUserDefaults.standardUserDefaults setDouble:_sidebarWidth forKey:DYBrowserPreference(DYBrowserSidebarPreference,_library)];[self layoutBrowser]; + if(_closed||_layingOut||_compactRecent)return;_sidebarWidth=_folderScroll.frame.size.width;[NSUserDefaults.standardUserDefaults setDouble:_sidebarWidth forKey:DYBrowserPreference(DYBrowserSidebarPreference,_library)];[self layoutBrowser]; } - (void)layoutChanged:(id)sender{[NSUserDefaults.standardUserDefaults setInteger:_layoutMenu.indexOfSelectedItem forKey:DYBrowserPreference(DYBrowserLayoutPreference,_library)];[self layoutBrowser];} - (void)resetThumbnailWork { @@ -404,7 +431,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b for(NSUInteger i=first;iid{for(id panel in [controls valueForKey:@"panels"])if([[panel valueForKey:@"toolType"]isEqual:type])return panel;return nil;}; auto value=[&](NSString *key)->double{for(NSDictionary *d in DYDescriptors())if([d[@"key"]isEqual:key])return [base->_values[d[@"pid"]]doubleValue];return NAN;}; publish();int undo=base->_undoStarts;NSDictionary *initial=[[base->_values copy]autorelease]; - NSMutableSet *types=[NSMutableSet set];NSInteger masks=0;CGFloat x=-1,lastY=-1;BOOL vertical=YES; - for(NSDictionary *a in [controls valueForKey:@"areas"]){if([a[@"kind"]isEqual:@"mask"])masks++;if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(x>=0)vertical&=r.origin.x==x&&r.origin.y>lastY;x=r.origin.x;lastY=r.origin.y;[types addObject:a[@"toolType"]];}} - run.record(@"viewer-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",vertical&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0); + NSMutableSet *types=[NSMutableSet set];NSInteger masks=0;CGFloat lastX=-1,y=-1;BOOL horizontal=YES; + for(NSDictionary *a in [controls valueForKey:@"areas"]){if([a[@"kind"]isEqual:@"mask"])masks++;if([a[@"kind"]isEqual:@"tool"]){NSRect r=[a[@"rect"]rectValue];if(lastX>=0)horizontal&=r.origin.x>lastX&&r.origin.y==y;lastX=r.origin.x;y=r.origin.y;[types addObject:a[@"toolType"]];}} + run.record(@"viewer-lower-left-rail-has-only-four-image-tools-and-three-persistent-mask-shapes",horizontal&&y>size.height*.9&&[types isEqual:[NSSet setWithArray:@[@"curve",@"lens",@"skin",@"look"]]]&&masks==3&&[[controls valueForKey:@"panels"]count]==0); NSDictionary *workspace=areaFor(controls,@"workspace",nil);NSRect workspaceRect=[workspace[@"rect"]rectValue]; run.record(@"viewer-control-panel-entry-is-labelled-and-anchored-at-bottom",[workspace[@"title"]isEqual:@"控制面板"]&&NSMidY(workspaceRect)>size.height*.9); __block NSInteger workspaceRequests=0;__block NSString *requestedPage=nil;__block NSInteger requestedMask=-1; @@ -64,7 +64,7 @@ host->_time=CMTimeMake(1,24);publish();run.record(@"viewer-new-frame-restores-the-same-independent-editor-target",[[curve valueForKey:@"nodeID"]isEqual:layerID]&&areaFor(curve,@"curvePlot",nil));host->_time=kCMTimeZero;publish(); doc=DYMutablePlist(DYReadTools(host,host->_time).document);DYRemoveTool(doc,layerID);DYWriteTools(host,doc,host->_time);publish();run.record(@"viewer-deleted-layer-falls-back-to-surviving-same-tool",[[curve valueForKey:@"nodeID"]isEqual:@"base:curve"]); click(areaFor(controls,@"tool",@"curve"));BOOL bounded=YES; - for(NSSize next:{NSMakeSize(120,80),NSMakeSize(180,200),NSMakeSize(320,240),NSMakeSize(1000,462),NSMakeSize(1280,720)})for(CGFloat scale:{1.,2.}){[controls setViewport:NSMakeRect(0,0,next.width,next.height)];[controls prepareWithSize:next scale:scale atTime:host->_time];for(NSDictionary *a in [controls valueForKey:@"areas"])bounded&=NSContainsRect(NSMakeRect(0,0,next.width,next.height),[a[@"rect"]rectValue]);bounded&=[controls partAtPoint:NSMakePoint(-1,20)]==0&&[controls partAtPoint:NSMakePoint(next.width+1,20)]==0&&[controls partAtPoint:NSMakePoint(30,next.height+1)]==0;} + for(NSSize next:{NSMakeSize(120,80),NSMakeSize(180,200),NSMakeSize(320,240),NSMakeSize(1000,462),NSMakeSize(1280,720)})for(CGFloat scale:{1.,2.}){[controls setViewport:NSMakeRect(0,0,next.width,next.height)];[controls prepareWithSize:next scale:scale atTime:host->_time];for(NSDictionary *a in [controls valueForKey:@"areas"])bounded&=NSContainsRect(NSMakeRect(0,0,next.width,next.height),[a[@"rect"]rectValue]);NSRect rail=[[controls valueForKey:@"rail"]rectValue],entry=[areaFor(controls,@"workspace",nil)[@"rect"]rectValue];bounded&=!NSIntersectsRect(rail,entry);bounded&=[controls partAtPoint:NSMakePoint(-1,20)]==0&&[controls partAtPoint:NSMakePoint(next.width+1,20)]==0&&[controls partAtPoint:NSMakePoint(30,next.height+1)]==0;} run.record(@"viewer-small-and-retina-canvases-never-hit-outside-visible-image",bounded); [controls setViewport:NSMakeRect(40,30,1160,650)];[controls prepareWithSize:size scale:1 atTime:host->_time];NSRect rail=[[controls valueForKey:@"rail"]rectValue];run.record(@"viewer-rail-is-anchored-to-image-and-not-letterbox",NSContainsRect(NSMakeRect(40,30,1160,650),rail)&&[controls partAtPoint:NSMakePoint(NSMidX(rail),20)]==0); [controls setViewport:NSMakeRect(0,0,1280,720)];[controls prepareWithSize:size scale:1 atTime:host->_time];click(areaFor(controls,@"tool",@"curve")); diff --git a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h index 10ffd70..e6625d7 100644 --- a/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h +++ b/大鱼调色/Plugin/DYWorkspaceDiagnostics.inc.h @@ -142,6 +142,7 @@ DYInspector *editor=[[[DYInspector alloc]initWithAPIManager:stackHost renderer:stackRenderer workspaceType:type]autorelease];editor.frame=NSMakeRect(0,0,424,235);[editor refresh];[editor layoutSubtreeIfNeeded];NSScrollView *strip=[editor valueForKey:@"scroll"];NSView *document=[editor valueForKey:@"document"];BOOL fits=!strip.hasVerticalScroller&&strip.hasHorizontalScroller&&fabs(document.bounds.size.height-strip.contentSize.height)<1;NSMutableArray *bad=[NSMutableArray array]; for(NSDictionary *record in [editor valueForKey:@"cards"]){NSView *card=record[@"view"];for(NSView *row in record[@"body"])if(!row.hidden&&!card.hidden){BOOL inside=NSContainsRect(card.bounds,[row.superview convertRect:row.frame toView:card]);fits&=inside;if(!inside)[bad addObject:@{@"id":row.identifier?:@"",@"frame":NSStringFromRect(row.frame),@"card":NSStringFromRect(card.bounds)}];}} run.record([@"workspace-horizontal-minimum-height-" stringByAppendingString:type],fits,@{@"document":NSStringFromRect(document.bounds),@"viewport":NSStringFromSize(strip.contentSize),@"outside":bad}); + if([type isEqual:@"look"]){NSView *recent=[editor valueForKey:@"recentHost"];CGFloat bottom=0;NSDictionary *lookCard=[[editor valueForKey:@"cards"]firstObject];for(NSView *row in lookCard[@"body"])if(!row.hidden)bottom=MAX(bottom,NSMaxY(row.frame));run.record(@"workspace-look-shortcuts-fit-below-visible-lut-controls",recent&&NSMinY(recent.frame)>bottom&&NSContainsRect([(NSView*)lookCard[@"view"]bounds],recent.frame));} if([type isEqual:@"hsl"]){for(NSNumber *width in @[@424,@760,@1040]){editor.frame=NSMakeRect(0,0,width.doubleValue,260);[editor layoutSubtreeIfNeeded];NSDictionary *cardRecord=[[editor valueForKey:@"cards"]firstObject];NSView *tabs=nil;BOOL together=YES;for(NSView *row in cardRecord[@"body"])if([row.identifier isEqual:@"hslTabs"])tabs=row;for(NSView *row in cardRecord[@"body"])if(!row.hidden&&[row.identifier hasPrefix:@"hsl0_"])together&=NSMinY(row.frame)>NSMaxY(tabs.frame)&&fabs(NSMinX(row.frame)-NSMinX(tabs.frame))<1&&fabs(row.frame.size.width-tabs.frame.size.width)<1;run.record([NSString stringWithFormat:@"workspace-hsl-swatch-and-axes-stay-together-%@",width],together);NSBitmapImageRep *image=[editor bitmapImageRepForCachingDisplayInRect:editor.bounds];[editor cacheDisplayInRect:editor.bounds toBitmapImageRep:image];[[image representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:[NSString stringWithFormat:@"workspace-hsl-%@.png",width]]atomically:YES];}} if([type isEqual:@"spider"]){NSView *panel=[editor valueForKey:@"spiderPanel"];[panel layoutSubtreeIfNeeded];NSView *disc=[panel valueForKey:@"disc"],*hues=[panel valueForKey:@"hues"];run.record(@"workspace-spider-places-disc-left-and-parameters-right",NSMaxX(disc.frame)<=NSMinX(hues.frame)&&NSContainsRect(panel.bounds,hues.frame));} } diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 1553597..f432510 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 78 + 79 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index a8cc6a1..d507e43 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.12.0 CFBundleVersion - 78 + 79 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright