fix: fit mask tracking controls and restore editable numeric fields in workspace

这个提交包含在:
mac 于 2026-11-05 10:13:09 +08:00 提交
1 父节点 0ef847f6bb
当前提交 411900b928
12 个文件已更改
+225 -62

没有与搜索条件相匹配的文件

+2 -1
查看文件
@@ -59,9 +59,10 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
- (BOOL)isFlipped{return YES;}
- (BOOL)isOpaque{return YES;}
- (void)dealloc{[_metadata release];[_raster release];[super dealloc];}
- (BOOL)isAccessibilityElement{return YES;}
- (NSString*)scopeTitle{return @[@"亮度波形",@"RGB 分列",@"直方图",@"矢量图"][_mode];}
- (void)setMetadata:(NSDictionary*)data{
if(_metadata==data)return;[_metadata release];_metadata=[data copy];[_raster release];_raster=nil;
if(_metadata==data&&self.accessibilityLabel.length)return;[_metadata release];_metadata=[data copy];[_raster release];_raster=nil;
NSString *key=_mode==0?@"waveform":_mode==1?@"parade":@"vectorscope";NSUInteger width=_mode==0?dyscope::Width:_mode==1?3*dyscope::Width:dyscope::Bins;NSData *bytes=_mode==2?nil:data[key];
if(bytes.length==width*dyscope::Bins*4){NSBitmapImageRep *rep=[[[NSBitmapImageRep alloc]initWithBitmapDataPlanes:nil pixelsWide:width pixelsHigh:dyscope::Bins bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSDeviceRGBColorSpace bytesPerRow:width*4 bitsPerPixel:32]autorelease];memcpy(rep.bitmapData,bytes.bytes,bytes.length);_raster=[[NSImage alloc]initWithSize:NSMakeSize(width,dyscope::Bins)];[_raster addRepresentation:rep];}
self.accessibilityLabel=[NSString stringWithFormat:@"%@ · %@ · 有效取样 %@",self.scopeTitle,data[@"domain"]?:@"等待画面",data[@"valid"]?:@0];[self setNeedsDisplay:YES];
+4 -1
查看文件
@@ -85,6 +85,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
}
- (void)drawBarInside:(NSRect)rect flipped:(BOOL)flipped {
NSRect track=NSMakeRect(rect.origin.x,NSMidY(rect)-2.5,rect.size.width,5);
if(DYThemeWorkspaceContext(self.controlView)&&![self trackColors]){NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];[[NSColor colorWithWhite:DYThemeIsLight()?.64:.29 alpha:1]setFill];[bar fill];double fraction=(self.doubleValue-self.minValue)/fmax(.000001,self.maxValue-self.minValue);NSRect active=track;active.size.width*=fmax(0,fmin(1,fraction));[[NSColor colorWithWhite:DYThemeIsLight()?.36:.69 alpha:1]setFill];[[NSBezierPath bezierPathWithRoundedRect:active xRadius:2.5 yRadius:2.5]fill];return;}
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(track,-.5,-1),3.5,YES,NO,NO);
NSArray *colors=[self trackColors];if(colors){NSGradient *g=[[[NSGradient alloc]initWithColors:colors]autorelease];[g drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5] angle:0];return;}
NSBezierPath *bar=[NSBezierPath bezierPathWithRoundedRect:track xRadius:2.5 yRadius:2.5];NSGradient *base=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot8"] endingColor:DYThemePalette()[@"slot9"]]autorelease];[base drawInBezierPath:bar angle:90];[[(DYThemeIsLight()?DYAccent():NSColor.blackColor) colorWithAlphaComponent:DYThemeIsLight()?.20:.28]setStroke];bar.lineWidth=.6;[bar stroke];
@@ -93,6 +94,7 @@ static NSString *DYNumber(double value,NSDictionary *d) {
}
- (void)drawKnob:(NSRect)knobRect {
NSRect circle=NSInsetRect(knobRect,1,1);
if(DYThemeWorkspaceContext(self.controlView)){[[NSColor colorWithWhite:DYThemeIsLight()?.94:.87 alpha:1]setFill];[[NSBezierPath bezierPathWithOvalInRect:circle]fill];return;}
if(DYThemeIsLight()){DYDrawSoftControl(circle,MIN(circle.size.width,circle.size.height)/2,NO,NO,self.highlighted);return;}
[DYThemeColor(@"knob") setFill];[[NSBezierPath bezierPathWithOvalInRect:circle] fill];
[DYAccent() setStroke];NSBezierPath *ring=[NSBezierPath bezierPathWithOvalInRect:circle];ring.lineWidth=.7;[ring stroke];
@@ -103,7 +105,8 @@ static NSString *DYNumber(double value,NSDictionary *d) {
@implementation DYNumberFieldCell
- (void)drawWithFrame:(NSRect)frame inView:(NSView *)view {
NSRect rect=NSInsetRect(frame,.5,.5);NSBezierPath *p=[NSBezierPath bezierPathWithRoundedRect:rect xRadius:2.5 yRadius:2.5];
if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO);
if(DYThemeWorkspaceContext(view)){[[NSColor colorWithWhite:DYThemeIsLight()?.82:.19 alpha:1]setFill];[p fill];[[NSColor colorWithWhite:DYThemeIsLight()?.55:.34 alpha:1]setStroke];p.lineWidth=.5;[p stroke];}
else if(DYThemeUsesRelief())DYDrawSoftControl(NSInsetRect(frame,1,2),5,YES,NO,NO);
else{NSGradient *gradient=[[[NSGradient alloc]initWithStartingColor:DYThemePalette()[@"slot5"] endingColor:DYThemePalette()[@"slot4"]]autorelease];[gradient drawInBezierPath:p angle:90];[[DYThemePalette()[@"accent"]colorWithAlphaComponent:.65]setStroke];p.lineWidth=.9;[p stroke];}
[NSGraphicsContext saveGraphicsState];[DYThemeTextShadow()set];[self drawInteriorWithFrame:NSInsetRect(frame,4,3) inView:view];[NSGraphicsContext restoreGraphicsState];
}
+1 -1
查看文件
@@ -466,7 +466,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b
}
- (void)endLibraryTask {
[_libraryTask release];_libraryTask=nil;[_progressTimer invalidate];[_progressTimer release];_progressTimer=nil;
_importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=@"完成";_done.toolTip=nil;
_importFiles.enabled=YES;_importFolder.enabled=YES;_refresh.title=@"刷新";_done.title=_embedded?@"返回调整":@"完成";_done.toolTip=nil;
}
- (void)reloadLibrary:(id)sender{
if(_libraryTask){[_libraryTask cancel];[self setStatus:@"正在取消…"];return;}
+5 -5
查看文件
@@ -18,7 +18,7 @@
- (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];}
- (CGFloat)contentHeight{return _workspaceMode?self.bounds.size.height:_contentHeight;}
- (CGFloat)contentWidth{
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL actions=(_tracking.count&&![_tracking[0]isHidden])||!_penRedraw.hidden;BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actionWidth=actions?216:0;if(pen&&shape&&self.bounds.size.height<242)actionWidth+=216;return MAX(620,16+ceil(double(count)/perColumn)*214+actionWidth+216);
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=216;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions);
}
- (void)selectMaskID:(NSString*)maskID{
if([_maskID isEqual:maskID]){if(!_canvasActive)[self canvas:nil];return;}BOOL found=NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID]){found=YES;break;}if(!found)return;
@@ -44,7 +44,7 @@
_penCancel=[DYButton(@"取消绘制",self,@selector(penCommand:))retain];_penCancel.toolTip=@"取消当前绘制,保留原蒙版路径";_penCancel.accessibilityLabel=@"取消钢笔绘制";[self addSubview:_penCancel];
_clear=[DYButton(@"清除轨迹",self,@selector(clear:))retain];[self addSubview:_clear];
NSArray *names=@[@"强度",@"羽化",@"中心 X",@"中心 Y",@"宽度",@"高度",@"旋转",@"渐变宽度",@"色相中心",@"色相范围",@"色相柔边",@"饱和度下限",@"饱和度上限",@"亮度下限",@"亮度上限",@"输入黑",@"输入白",@"输入伽马"];
for(NSInteger i=0;i<names.count;i++){NSTextField *label=[DYLabel(names[i],13)retain];label.font=[NSFont systemFontOfSize:13 weight:NSFontWeightMedium];NSSlider *slider=[[NSSlider alloc]initWithFrame:NSZeroRect];slider.tag=i;slider.target=self;slider.action=@selector(valueChanged:);slider.continuous=NO;slider.controlSize=NSControlSizeRegular;slider.accessibilityLabel=[names[i]stringByAppendingString:@"蒙版"];NSTextField *field=[[NSTextField alloc]initWithFrame:NSZeroRect];field.cell=[[[DYNumberFieldCell alloc]initTextCell:@"0"]autorelease];field.font=[NSFont monospacedDigitSystemFontOfSize:13 weight:NSFontWeightMedium];field.textColor=DYInk();field.backgroundColor=DYThemeColor(@"field");field.bezeled=NO;field.bordered=NO;field.drawsBackground=NO;field.tag=i;field.target=self;field.action=@selector(valueChanged:);field.accessibilityLabel=[names[i]stringByAppendingString:@"蒙版数值"];field.alignment=NSTextAlignmentCenter;[self addSubview:label];[self addSubview:slider];[self addSubview:field];[_rows addObject:@{@"label":label,@"slider":slider,@"field":field}];[label release];[slider release];[field release];}
for(NSInteger i=0;i<names.count;i++){NSTextField *label=[DYLabel(names[i],13)retain];label.font=[NSFont systemFontOfSize:13 weight:NSFontWeightMedium];NSSlider *slider=[[NSSlider alloc]initWithFrame:NSZeroRect];slider.tag=i;slider.target=self;slider.action=@selector(valueChanged:);slider.continuous=NO;slider.controlSize=NSControlSizeRegular;slider.accessibilityLabel=[names[i]stringByAppendingString:@"蒙版"];NSTextField *field=[[NSTextField alloc]initWithFrame:NSZeroRect];field.cell=[[[DYNumberFieldCell alloc]initTextCell:@"0"]autorelease];field.font=[NSFont monospacedDigitSystemFontOfSize:13 weight:NSFontWeightMedium];field.textColor=DYInk();field.backgroundColor=DYThemeColor(@"field");field.bezeled=NO;field.bordered=NO;field.drawsBackground=NO;field.editable=YES;field.selectable=YES;field.tag=i;field.target=self;field.action=@selector(valueChanged:);field.accessibilityLabel=[names[i]stringByAppendingString:@"蒙版数值"];field.alignment=NSTextAlignmentCenter;[self addSubview:label];[self addSubview:slider];[self addSubview:field];[_rows addObject:@{@"label":label,@"slider":slider,@"field":field}];[label release];[slider release];[field release];}
NSArray *titles=@[@"反向单帧",@"反向跟踪",@"双向跟踪",@"正向跟踪",@"正向单帧",@"取消跟踪"];
for(int i=0;i<6;i++){NSButton *b=DYButton(titles[i],self,@selector(track:));b.tag=((int[]){-2,-1,0,1,2,9})[i];b.font=[NSFont systemFontOfSize:13 weight:NSFontWeightMedium];b.controlSize=NSControlSizeRegular;b.accessibilityLabel=@[@"反向跟踪一帧",@"反向蒙版跟踪",@"双向蒙版跟踪",@"正向蒙版跟踪",@"正向跟踪一帧",@"取消蒙版跟踪"][i];[self addSubview:b];[_tracking addObject:b];}
for(NSButton *b in @[_eye,_add,_remove,_canvas,_clear,_penRedraw,_penFinish,_penCancel]){b.controlSize=NSControlSizeRegular;b.font=[NSFont systemFontOfSize:(b==_add||b==_remove)?18:13 weight:NSFontWeightMedium];}
@@ -74,8 +74,8 @@
if(_workspaceMode){
CGFloat h=self.bounds.size.height;_eye.frame=NSMakeRect(8,4,26,28);_list.frame=NSMakeRect(38,4,132,28);_add.frame=NSMakeRect(174,4,26,28);_remove.frame=NSMakeRect(204,4,26,28);_combine.frame=NSMakeRect(242,4,92,28);_invert.frame=NSMakeRect(344,6,68,24);_canvas.frame=NSMakeRect(422,4,100,28);
NSInteger perColumn=MAX(1,NSInteger((h-48)/44));NSUInteger index=0;
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*214,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,126,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+132,y,66,22)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,198,18)];index++;}
CGFloat x=16+ceil(double(index)/perColumn)*214,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*184,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,100,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+108,y,66,22)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,174,18)];index++;}
CGFloat x=16+ceil(double(index)/perColumn)*184,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
if(pen){_penRedraw.frame=NSMakeRect(x,y,aw,25);y+=29;_penFinish.frame=NSMakeRect(x,y,97,25);_penCancel.frame=NSMakeRect(x+103,y,97,25);y+=33;}
if(shape){if(y+135>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;}
// Pen and tracking actions get adjacent columns when the short strip cannot
@@ -99,7 +99,7 @@
- (void)enabled:(NSButton*)sender{[self edit:@"启停蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"enabled"]=@(sender.state==NSControlStateValueOn);}];}
- (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];}
- (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p=DYMaskAtTime(m,self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&i<8){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYMaskKey(self->_time,p,YES,1)];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
- (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;}
- (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;}
- (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return 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"],*toolbar=[workspace valueForKey:@"toolbar"],*closeButton=[workspace valueForKey:@"_close"];NSArray *plots=[workspace valueForKey:@"scopePlots"];BOOL tabs=NO;for(NSView *view in root.subviews)tabs|=[view isKindOfClass:NSSegmentedControl.class];
run.record(@"workspace-layer-driven-editing-has-no-root-tabs-and-four-persistent-scopes",!tabs&&plots.count==4&&!scopePane.hidden&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]&&[(NSSplitView*)[workspace valueForKey:@"split"]subviews].count==3);
BOOL plotsAccessible=YES;for(NSView *plot in plots)plotsAccessible&=plot.isAccessibilityElement&&plot.accessibilityLabel.length>0;run.record(@"workspace-all-four-scope-images-have-accessible-titles",plotsAccessible);
run.record(@"workspace-default-requests-a-narrow-resizable-strip",host->_minimumRequested.width==840&&host->_maximumRequested.width==1440&&host->_maximumRequested.height==360);
[workspace showPage:@"scopes" maskKind:nil];run.record(@"workspace-scope-shortcut-preserves-adjustment-editor-and-capture",[[workspace valueForKey:@"editorMode"]integerValue]==0&&[[scopeRenderer valueForKey:@"scopeEnabled"]boolValue]);
NSBitmapImageRep *headerBitmap=DYWorkspaceHeaderBitmap(root);NSUInteger toolbarInk=DYWorkspaceHeaderInk(headerBitmap,root,toolbar),closeInk=DYWorkspaceHeaderInk(headerBitmap,root,closeButton);
@@ -108,7 +109,10 @@
chooseNode(@"base:hsl");NSArray *entryRows=[stack valueForKey:@"layerRows"];NSInteger entryRow=-1;for(NSUInteger i=0;i<entryRows.count;i++)if([entryRows[i][@"node"]isEqual:@"base:hsl"]&&!entryRows[i][@"mask"])entryRow=i;
NSButton *maskEntry=[NSButton buttonWithTitle:@"" target:nil action:nil];maskEntry.tag=entryRow;[stack editWorkspaceRowMask:maskEntry];workspaceDrain();
run.record(@"workspace-layer-mask-symbol-enters-shared-mask-editor-with-persistent-scopes",entryRow>=0&&[[stack valueForKey:@"selectedMask"]isEqual:sharedID]&&[[stack valueForKey:@"editorMode"]integerValue]==1&&![(NSView*)[stack valueForKey:@"scopePane"]isHidden]);
[stack setValue:@.18 forKey:@"splitFraction"];[stack setValue:@.27 forKey:@"scopeFraction"];[stackHost->_parent setFrameSize:NSMakeSize(1440,360)];[(NSView*)[stack valueForKey:@"root"]layoutSubtreeIfNeeded];
NSScrollView *maskStrip=[stack valueForKey:@"maskScroll"],*assignStrip=[stack valueForKey:@"assignmentScroll"];NSView *maskContent=maskStrip.documentView;[maskContent layoutSubtreeIfNeeded];BOOL maskFits=YES;for(NSView *view in maskContent.subviews)if(!view.hidden)maskFits&=NSContainsRect(maskContent.bounds,view.frame);
run.record(@"workspace-default-wide-strip-keeps-entire-rectangle-editor-visible",maskContent.frame.size.width<=maskStrip.contentSize.width+1&&maskFits,@{@"document":NSStringFromRect(maskContent.frame),@"viewport":NSStringFromSize(maskStrip.contentSize)});
BOOL fieldsEditable=YES;for(NSDictionary *row in [maskContent valueForKey:@"rows"])if(![row[@"label"]isHidden])fieldsEditable&=[row[@"field"]isEditable]&&[row[@"field"]isSelectable];run.record(@"workspace-mask-number-fields-accept-direct-editing",fieldsEditable);
run.record(@"workspace-mask-editor-and-assignments-fit-height-without-vertical-scrollers",!maskStrip.hasVerticalScroller&&!assignStrip.hasVerticalScroller&&fabs(maskContent.frame.size.height-maskStrip.contentSize.height)<1&&maskFits,@{@"mask":NSStringFromRect(maskContent.bounds),@"viewport":NSStringFromSize(maskStrip.contentSize)});
[stack deleteWorkspaceSelection:nil];workspaceDrain();tools=DYReadTools(stackHost,kCMTimeZero).document;NSView *maskEditor=[stack valueForKey:@"maskEditor"];
run.record(@"workspace-deleting-selected-mask-clears-editor-and-all-shared-bindings",!DYSharedMaskWithID(tools,sharedID)&&!DYMasksForTool(tools,@"base:hsl").count&&!DYMasksForTool(tools,@"base:spider").count&&![[stack valueForKey:@"selectedMask"]length]&&(!maskEditor||!maskEditor.superview||maskEditor.hidden));
+2 -2
查看文件
@@ -28,8 +28,8 @@
_toolPane.frame=NSMakeRect(0,0,left,h);_editorHost.frame=NSMakeRect(left+divider,0,editor,h);_scopePane.frame=NSMakeRect(left+divider+editor+divider,0,scope,h);
_layerScroll.frame=NSMakeRect(0,0,left,MAX(1,h-35));[_layerScroll layoutSubtreeIfNeeded];NSSize layerViewport=_layerScroll.contentView.bounds.size;_layerTable.frame=NSMakeRect(0,0,layerViewport.width,MAX(layerViewport.height,_layerRows.count*_layerTable.rowHeight));[_layerTable.tableColumns.firstObject setWidth:layerViewport.width];_addMask.frame=NSMakeRect(6,MAX(0,h-32),MAX(80,left-76),28);_deleteLayer.frame=NSMakeRect(MAX(92,left-66),MAX(0,h-32),60,28);
CGFloat ew=_editorHost.bounds.size.width;_selectionTitle.frame=NSMakeRect(12,5,MAX(1,ew-24),22);_toolEditor.frame=NSMakeRect(0,29,ew,MAX(1,h-29));
_maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(230,MAX(160,ew*.25));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height);
if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(620,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];}
_maskPane.frame=NSMakeRect(0,29,ew,MAX(1,h-29));CGFloat aw=MIN(188,MAX(152,ew*.23));_assignmentScroll.frame=NSMakeRect(ew-aw,0,aw,_maskPane.bounds.size.height);_maskScroll.frame=NSMakeRect(0,0,MAX(1,ew-aw-8),_maskPane.bounds.size.height);
if(_maskEditor){_maskEditor.frame=NSMakeRect(0,0,MAX(536,_maskScroll.contentSize.width),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];_maskEditor.frame=NSMakeRect(0,0,MAX(_maskScroll.contentSize.width,_maskEditor.contentWidth),_maskScroll.contentSize.height);[_maskEditor layoutSubtreeIfNeeded];}
[self layoutMaskAssignments];
_sizingSplit=NO;
}
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.12.0</string>
<key>CFBundleVersion</key>
<string>75</string>
<string>76</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>PlugInKit</key>
+1 -1
查看文件
@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.12.0</string>
<key>CFBundleVersion</key>
<string>75</string>
<string>76</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>