fix: start workspace as a narrow strip and keep native row controls visible
这个提交包含在:
1 父节点
a0a97dfd88
当前提交
a9cf2eda29
5 个文件已更改
+340
-64
没有与搜索条件相匹配的文件
@@ -81,12 +81,12 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
DYWorkspaceRoot *_root;NSView *_scopePane,*_lutPane;
|
||||
DYScopePlot *_plot;
|
||||
NSTextField *_heading,*_description,*_status,*_lutExplanation;
|
||||
NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes;
|
||||
NSSegmentedControl *_pages;NSPopUpButton *_scopeMode;NSButton *_close,*_hostScopes,*_sizeMode;
|
||||
DYWorkspaceLifetime *_lifetime;
|
||||
NSProgress *_selectionTask;
|
||||
NSView *_remoteParent;NSWindow *_presentationWindow;
|
||||
NSString *_title,*_lastError;
|
||||
BOOL _visible,_opening,_closed,_closing;
|
||||
BOOL _visible,_opening,_closed,_closing,_expanded;
|
||||
NSUInteger _session,_selectionID;
|
||||
NSView *_toolPane,*_editorHost,*_toolbar,*_maskPane;NSScrollView *_toolbarScroll,*_layerScroll,*_maskScroll,*_assignmentScroll;
|
||||
NSSplitView *_split;NSTableView *_layerTable;DYInspector *_toolEditor;NSView<DYWorkspaceMaskEditing> *_maskEditor;
|
||||
@@ -104,6 +104,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
_heading=[[DYThemeLabel labelWithString:@""]retain];_heading.stringValue=[NSString stringWithFormat:@"%@ · 辅助工作区",_title];_heading.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold];[_root addSubview:_heading];
|
||||
_pages=[[NSSegmentedControl alloc]init];_pages.segmentCount=4;for(NSInteger i=0;i<4;i++)[_pages setLabel:@[@"调整",@"蒙版",@"LUT",@"示波器"][i]forSegment:i];_pages.selectedSegment=0;_pages.target=self;_pages.action=@selector(pageChanged:);_pages.accessibilityLabel=@"控制面板页面";[_root addSubview:_pages];
|
||||
_close=[[DYThemeButton alloc]init];_close.title=@"关闭";_close.target=self;_close.action=@selector(closePressed:);_close.bezelStyle=NSBezelStyleRounded;[_root addSubview:_close];
|
||||
_sizeMode=[DYWorkspaceButton(@"",self,@selector(toggleWorkspaceSize:))retain];_sizeMode.imagePosition=NSImageOnly;[_root addSubview:_sizeMode];
|
||||
_scopePane=[[DYWorkspaceRoot alloc]init];_scopePane.clipsToBounds=YES;[_root addSubview:_scopePane];_lutPane=[[NSView alloc]init];[_root addSubview:_lutPane];_lutPane.hidden=YES;
|
||||
_scopeMode=[[DYThemePopUpButton alloc]init];[_scopeMode addItemsWithTitles:@[@"亮度波形",@"RGB 分列",@"直方图"]];_scopeMode.target=self;_scopeMode.action=@selector(scopeModeChanged:);_scopeMode.accessibilityLabel=@"示波器类型";[_scopePane addSubview:_scopeMode];
|
||||
_hostScopes=[[DYThemeButton alloc]init];_hostScopes.title=@"FCP 示波器";_hostScopes.bezelStyle=NSBezelStyleRounded;_hostScopes.target=self;_hostScopes.action=@selector(toggleHostScopes:);_hostScopes.toolTip=@"打开或关闭 Final Cut Pro 自带的视频示波器;下方是大鱼的显示参考示波器";[_scopePane addSubview:_hostScopes];
|
||||
@@ -120,7 +121,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
}
|
||||
- (void)dealloc{
|
||||
[self close];_lifetime.owner=nil;[NSNotificationCenter.defaultCenter removeObserver:self];_root.owner=nil;
|
||||
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_title release];[_lastError release];[_lifetime release];
|
||||
[_manager release];[_renderer release];[_library release];[_browser release];[_root release];[_scopePane release];[_lutPane release];[_plot release];[_heading release];[_description release];[_status release];[_lutExplanation release];[_pages release];[_scopeMode release];[_close release];[_hostScopes release];[_sizeMode release];[_title release];[_lastError release];[_lifetime release];
|
||||
[_toolPane release];[_editorHost release];[_toolbar release];[_maskPane release];[_toolbarScroll release];[_layerScroll release];[_maskScroll release];[_assignmentScroll release];[_split release];[_layerTable release];[_toolEditor release];[_maskEditor release];[_selectionTitle release];[_addMask release];[_deleteLayer release];[_layerRows release];[_toolDocument release];[_selectedNode release];[_selectedMask release];[_maskNode release];[_editorNode release];[(id)_lutTarget release];[super dealloc];
|
||||
}
|
||||
- (BOOL)visible{return _visible||_opening;}
|
||||
@@ -141,7 +142,9 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
void(^reply)(FxXPView *,NSError *)=^(FxXPView *parent,NSError *error){void(^attach)(void)=^{DYColorWorkspace *owner=token.owner;if(!owner||owner->_closed||owner->_session!=session)return;owner->_opening=NO;
|
||||
if(!parent){[owner reportError:error.localizedDescription?:@"宿主未能创建辅助窗口"];return;}[owner attachToParent:parent];
|
||||
};if(NSThread.isMainThread)attach();else dispatch_sync(dispatch_get_main_queue(),attach);};
|
||||
if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(720,300) maximumSize:NSMakeSize(2400,1200) reply:reply];
|
||||
// FCP initially uses the requested maximum. Keep the default a narrow strip;
|
||||
// larger LUT/mask layouts are an explicit choice, without moving host windows.
|
||||
if(sizable)[sizable remoteWindowWithMinimumSize:NSMakeSize(720,300) maximumSize:_expanded?NSMakeSize(2400,1200):NSMakeSize(1440,360) reply:reply];
|
||||
else if(remote)[remote remoteWindowOfSize:NSMakeSize(1120,360) reply:reply];
|
||||
else{_opening=NO;[self reportError:@"当前宿主未提供外部工具窗口接口"];}
|
||||
}@finally{[action endAction:self];}
|
||||
@@ -163,7 +166,8 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
}
|
||||
- (void)layoutWorkspace{
|
||||
CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height;
|
||||
_heading.frame=NSMakeRect(12,9,MAX(100,w-430),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-398),7,306,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27);
|
||||
_heading.frame=NSMakeRect(12,9,MAX(100,w-466),23);_heading.stringValue=@"大鱼调色 · 控制面板";_pages.frame=NSMakeRect(MAX(150,w-434),7,306,27);_sizeMode.frame=NSMakeRect(MAX(0,w-120),7,28,27);_close.frame=NSMakeRect(MAX(0,w-80),7,64,27);
|
||||
_sizeMode.image=[NSImage imageWithSystemSymbolName:_expanded?@"arrow.down.right.and.arrow.up.left":@"arrow.up.left.and.arrow.down.right" accessibilityDescription:_expanded?@"收为窄条":@"扩大工作区"];_sizeMode.accessibilityLabel=_expanded?@"收为窄条":@"扩大工作区";_sizeMode.toolTip=_sizeMode.accessibilityLabel;_sizeMode.contentTintColor=DYThemeColor(@"text");
|
||||
_toolbarScroll.frame=NSMakeRect(8,39,MAX(1,w-16),40);
|
||||
_sizingSplit=YES;_split.frame=NSMakeRect(0,80,w,MAX(1,h-80));_sizingSplit=NO;[self layoutToolWorkspace];
|
||||
_scopePane.frame=_editorHost.bounds;_lutPane.frame=NSMakeRect(0,25,_editorHost.bounds.size.width,MAX(1,_editorHost.bounds.size.height-25));_lutExplanation.frame=NSMakeRect(8,2,MAX(1,_editorHost.bounds.size.width-16),22);
|
||||
@@ -245,6 +249,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
else if(error)*error=[NSError errorWithDomain:@"com.dayu.color.workspace" code:1 userInfo:@{NSLocalizedDescriptionKey:failure?:@"LUT 操作未完成"}];return written;
|
||||
}
|
||||
- (void)closePressed:(id)sender{[self close];}
|
||||
- (void)toggleWorkspaceSize:(id)sender{BOOL expanded=!_expanded;[self close];_expanded=expanded;[self showRelativeToView:nil];}
|
||||
- (void)remoteClosed:(NSNotification *)notification{_closing=YES;[self close];_closing=NO;}
|
||||
- (void)close{
|
||||
if(_closed)return;BOOL hadPresentation=_visible||_opening||_remoteParent;_closed=YES;_visible=NO;_opening=NO;_session++;_selectionID++;[_selectionTask cancel];[_selectionTask release];_selectionTask=nil;[_renderer setScopeEnabled:NO];
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
run.record(@"workspace-remote-attaches-within-host-permissions",workspace.visible&&host->_requests==1&&!host->_permissionFailure&&root.superview==host->_parent&&!fixture.visible);
|
||||
NSView *scopePane=[workspace valueForKey:@"scopePane"],*heading=[workspace valueForKey:@"heading"],*pages=[workspace valueForKey:@"pages"],*closeButton=nil;for(NSView *control in root.subviews)if([control isKindOfClass:NSButton.class]&&[[(NSButton*)control title]isEqual:@"关闭"])closeButton=control;
|
||||
run.record(@"workspace-opens-on-adjustments-with-four-pages-and-no-background-scope-capture",[(NSSegmentedControl*)pages segmentCount]==4&&[(NSSegmentedControl*)pages selectedSegment]==0&&![[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&host->_minimumRequested.height<=300);
|
||||
run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==720&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360);
|
||||
[workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scopes-page-enables-only-visible-output-capture",[(NSSegmentedControl*)pages selectedSegment]==3&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]);
|
||||
NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger headingInk=DYWorkspaceHeaderInk(headerBitmap,root,heading),pagesInk=DYWorkspaceHeaderInk(headerBitmap,root,pages),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
|
||||
NSString *headerPNG=[runtime stringByAppendingPathComponent:@"workspace-topbar.png"];BOOL headerSaved=[[headerBitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:headerPNG atomically:YES];
|
||||
@@ -86,6 +87,9 @@
|
||||
[curveEditor graphicGesture:YES title:@"测试外部改值"];[stackHost startAction:stack];NSMutableDictionary *externalCurve=DYMutablePlist(DYReadTools(stackHost,kCMTimeZero).document);((NSMutableDictionary*)DYToolWithID(externalCurve,curveID))[@"values"][@"curveY0"]=@22;DYWriteTools(stackHost,externalCurve,kCMTimeZero);[stackHost endAction:stack];[curveEditor writeGraphicValues:@{@"curveY0":@44}];[curveEditor graphicGesture:NO title:nil];
|
||||
run.record(@"workspace-curve-gesture-preserves-an-external-parameter-edit",[DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,curveID)[@"values"][@"curveY0"]doubleValue]==22);
|
||||
NSView *workspaceRoot=[stack valueForKey:@"root"];[workspaceRoot layoutSubtreeIfNeeded];NSBitmapImageRep *workspaceImage=[workspaceRoot bitmapImageRepForCachingDisplayInRect:workspaceRoot.bounds];[workspaceRoot cacheDisplayInRect:workspaceRoot.bounds toBitmapImageRep:workspaceImage];[[workspaceImage representationUsingType:NSBitmapImageFileTypePNG properties:@{}]writeToFile:[runtime stringByAppendingPathComponent:@"workspace-adjustments.png"]atomically:YES];
|
||||
[stackHost->_parent setFrameSize:NSMakeSize(720,300)];[workspaceRoot layoutSubtreeIfNeeded];[table layoutSubtreeIfNeeded];BOOL eyesInside=YES;NSUInteger eyes=0;
|
||||
for(NSInteger row=0;row<table.numberOfRows;row++){NSTableCellView *cell=[table viewAtColumn:0 row:row makeIfNecessary:YES];[cell layoutSubtreeIfNeeded];for(NSView *view in cell.subviews)if([view isKindOfClass:NSButton.class]){NSRect frame=[table convertRect:view.bounds fromView:view];eyesInside&=NSContainsRect(table.visibleRect,frame)&&NSContainsRect(cell.bounds,view.frame);eyes++;}}
|
||||
run.record(@"workspace-native-row-bypass-buttons-remain-visible-at-minimum-width",eyesInside&&eyes==table.numberOfRows,@{@"buttons":@(eyes),@"rows":@(table.numberOfRows)});[stackHost->_parent setFrameSize:NSMakeSize(1120,360)];[workspaceRoot layoutSubtreeIfNeeded];
|
||||
[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookA=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack addWorkspaceTool:toolbarButton(@"look")];workspaceDrain();NSString *lookB=[[[stack valueForKey:@"selectedNode"]copy]autorelease];
|
||||
run.need(@"workspace-two-independent-lut-layer-fixtures-exist",lookA&&lookB&&![lookA isEqual:lookB]&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookA)&&DYToolWithID(DYReadTools(stackHost,kCMTimeZero).document,lookB));
|
||||
NSString *pathA=[runtime stringByAppendingPathComponent:@"workspace-A.cube"],*pathB=[runtime stringByAppendingPathComponent:@"workspace-B.cube"],*late=[runtime stringByAppendingPathComponent:@"workspace-late.cube"];NSDictionary *basePaths=[[DYReadAssets(stackHost,kCMTimeZero).paths copy]autorelease];NSError *failure=nil;
|
||||
@@ -107,4 +111,5 @@
|
||||
run.record(@"workspace-closed-panel-never-steals-canvas-or-module-selection",oldMask&&canvasSelections==1&&toolSelections==0&&!stack.visible);
|
||||
[NSNotificationCenter.defaultCenter removeObserver:canvasObserver];[NSNotificationCenter.defaultCenter removeObserver:toolObserver];
|
||||
run.record(@"workspace-new-stack-actions-stay-on-main-in-host-permissions-and-balanced-undo",stackHost->_writesInAction&&!stackHost->_permissionFailure&&stackHost->_actionDepth==0&&stackHost->_undoStarts==stackHost->_undoEnds&&!fixture.visible);
|
||||
[stack showRelativeToView:nil];workspaceDrain();NSString *selectedBefore=[[[stack valueForKey:@"selectedNode"]copy]autorelease];[stack toggleWorkspaceSize:nil];workspaceDrain();BOOL expanded=stack.visible&&stackHost->_maximumRequested.height==1200&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore];[stack toggleWorkspaceSize:nil];workspaceDrain();run.record(@"workspace-size-mode-keeps-selection-and-recreates-only-host-window",expanded&&stack.visible&&stackHost->_maximumRequested.height==360&&[[stack valueForKey:@"selectedNode"]isEqual:selectedBefore]&&!stackHost->_permissionFailure);[stack close];
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
_split=[[NSSplitView alloc]init];_split.vertical=YES;_split.dividerStyle=NSSplitViewDividerStyleThin;_split.delegate=self;_split.accessibilityLabel=@"调整图层与参数宽度";[_root addSubview:_split];
|
||||
_toolPane=[[DYWorkspaceList alloc]init];_editorHost=[[DYWorkspaceList alloc]init];_editorHost.clipsToBounds=YES;[_split addSubview:_toolPane];[_split addSubview:_editorHost];
|
||||
_layerScroll=[[NSScrollView alloc]init];_layerScroll.hasVerticalScroller=YES;_layerScroll.autohidesScrollers=YES;_layerScroll.drawsBackground=NO;[_toolPane addSubview:_layerScroll];
|
||||
_layerTable=[[NSTableView alloc]init];NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
|
||||
_layerTable=[[NSTableView alloc]init];_layerTable.style=NSTableViewStylePlain;_layerTable.intercellSpacing=NSZeroSize;NSTableColumn *column=[[[NSTableColumn alloc]initWithIdentifier:@"layer"]autorelease];column.title=@"模块与蒙版";[_layerTable addTableColumn:column];_layerTable.headerView=nil;_layerTable.rowHeight=30;_layerTable.dataSource=self;_layerTable.delegate=self;_layerTable.backgroundColor=DYThemeColor(@"background");_layerTable.columnAutoresizingStyle=NSTableViewLastColumnOnlyAutoresizingStyle;_layerTable.accessibilityLabel=@"模块与共享蒙版";_layerScroll.documentView=_layerTable;
|
||||
_addMask=[DYWorkspaceButton(@"+ 蒙版",self,@selector(addWorkspaceMask:))retain];[_toolPane addSubview:_addMask];
|
||||
_deleteLayer=[DYWorkspaceButton(@"删除",self,@selector(deleteWorkspaceSelection:))retain];[_toolPane addSubview:_deleteLayer];
|
||||
_selectionTitle=[[DYThemeLabel labelWithString:@""]retain];_selectionTitle.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];[_editorHost addSubview:_selectionTitle];
|
||||
@@ -71,8 +71,9 @@
|
||||
}
|
||||
- (NSInteger)numberOfRowsInTableView:(NSTableView*)table {return _layerRows.count;}
|
||||
- (NSView*)tableView:(NSTableView*)table viewForTableColumn:(NSTableColumn*)column row:(NSInteger)row {
|
||||
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.frame=NSMakeRect(8,5,MAX(20,column.width-48),20);label.autoresizingMask=NSViewWidthSizable;[cell addSubview:label];cell.textField=label;
|
||||
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.frame=NSMakeRect(column.width-30,2,26,26);eye.autoresizingMask=NSViewMinXMargin;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];return cell;
|
||||
NSDictionary*item=_layerRows[row];NSTableCellView*cell=[[[NSTableCellView alloc]initWithFrame:NSMakeRect(0,0,column.width,table.rowHeight)]autorelease];NSTextField*label=[DYThemeLabel labelWithString:item[@"title"]];label.font=[NSFont systemFontOfSize:item[@"mask"]?11:12];label.lineBreakMode=NSLineBreakByTruncatingTail;label.translatesAutoresizingMaskIntoConstraints=NO;[cell addSubview:label];cell.textField=label;
|
||||
NSButton*eye=DYWorkspaceButton(@"",self,@selector(toggleWorkspaceRow:));eye.image=[NSImage imageWithSystemSymbolName:[item[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用或旁路"];eye.bordered=NO;eye.imagePosition=NSImageOnly;eye.tag=row;eye.translatesAutoresizingMaskIntoConstraints=NO;eye.accessibilityLabel=[item[@"title"]stringByAppendingString:@"启用或旁路"];[cell addSubview:eye];
|
||||
[NSLayoutConstraint activateConstraints:@[[eye.trailingAnchor constraintEqualToAnchor:cell.trailingAnchor constant:-6],[eye.centerYAnchor constraintEqualToAnchor:cell.centerYAnchor],[eye.widthAnchor constraintEqualToConstant:26],[eye.heightAnchor constraintEqualToConstant:26],[label.leadingAnchor constraintEqualToAnchor:cell.leadingAnchor constant:8],[label.trailingAnchor constraintEqualToAnchor:eye.leadingAnchor constant:-4],[label.centerYAnchor constraintEqualToAnchor:cell.centerYAnchor],[label.heightAnchor constraintEqualToConstant:20]]];return cell;
|
||||
}
|
||||
- (void)tableViewSelectionDidChange:(NSNotification*)note {
|
||||
if(_refreshingStack)return;NSInteger row=_layerTable.selectedRow;if(row<0||row>=_layerRows.count)return;_hasUserSelection=YES;NSDictionary*item=_layerRows[row];[_selectedNode release];_selectedNode=[item[@"node"]copy];[_selectedMask release];_selectedMask=[item[@"mask"]copy];_pages.selectedSegment=_selectedMask?1:0;[self rebuildWorkspaceEditor];[self pageChanged:nil];
|
||||
|
||||
在新工单中引用
屏蔽一个用户