wip: replace workspace tabs with horizontal layer-driven editing and persistent four-up scopes
这个提交包含在:
1 父节点
57059390d1
当前提交
1396d5b7bf
18 个文件已更改
+207
-147
没有与搜索条件相匹配的文件
+14
-16
@@ -1,6 +1,7 @@
|
||||
// Native per-tool mask editor, shared by original and repeated tool cards.
|
||||
@interface DYToolMaskPanel : DYFlippedView<DYWorkspaceMaskEditing>
|
||||
@property(nonatomic,readonly) CGFloat contentHeight;
|
||||
@property(nonatomic,readonly) CGFloat contentWidth;
|
||||
@property(nonatomic) BOOL workspaceMode;
|
||||
@property(nonatomic,readonly) NSString *selectedMaskID;
|
||||
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID;
|
||||
@@ -15,12 +16,10 @@
|
||||
@synthesize workspaceMode=_workspaceMode;
|
||||
- (NSString*)selectedMaskID{return _maskID;}
|
||||
- (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];}
|
||||
- (CGFloat)workspaceHeightForWidth:(CGFloat)width{
|
||||
if(!_contentHeight)return 0;CGFloat w=MAX(560,width),header=w>=860?48:88;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;
|
||||
CGFloat side=shape?MIN(240,MAX(190,w*.27)):0,left=w-16-(shape?side+20:0);NSInteger columns=shape?2:MIN(3,MAX(1,NSInteger(left/172)));CGFloat scalar=ceil(double(count)/columns)*50;
|
||||
CGFloat actions=(pen?80:0)+(shape?174:0)+60;return header+(shape?MAX(scalar,actions):scalar+68)+8;
|
||||
- (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);
|
||||
}
|
||||
- (CGFloat)contentHeight{return _workspaceMode&&self.bounds.size.width>=560?[self workspaceHeightForWidth:self.bounds.size.width]:_contentHeight;}
|
||||
- (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;
|
||||
[_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil];
|
||||
@@ -72,17 +71,16 @@
|
||||
}
|
||||
- (void)layout{
|
||||
[super layout];CGFloat w=self.bounds.size.width;
|
||||
if(_workspaceMode&&w>=560){
|
||||
CGFloat x=8,y=8;BOOL wide=w>=860,shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
|
||||
CGFloat first=wide?MAX(180,w-470):w-128;_eye.frame=NSMakeRect(x,y,28,30);x+=36;_list.frame=NSMakeRect(x,y,first,30);x+=first+6;_add.frame=NSMakeRect(x,y,30,30);x+=34;_remove.frame=NSMakeRect(x,y,30,30);x+=40;
|
||||
if(!wide){x=8;y=48;}_combine.frame=NSMakeRect(x,y,106,30);x+=116;_invert.frame=NSMakeRect(x,y+2,76,26);x+=86;_canvas.frame=NSMakeRect(x,y,MAX(100,w-x-8),30);
|
||||
CGFloat top=wide?48:88,side=shape?MIN(240,MAX(190,w*.27)):0,left=w-16-(shape?side+20:0);NSInteger columns=shape?2:MIN(3,MAX(1,NSInteger(left/172)));CGFloat cell=(left-(columns-1)*16)/columns;NSUInteger index=0;
|
||||
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat rx=8+(index%columns)*(cell+16),ry=top+(index/columns)*50;label.frame=NSMakeRect(rx,ry+3,MAX(62,cell-80),21);[row[@"field"]setFrame:NSMakeRect(rx+cell-76,ry,76,25)];[row[@"slider"]setFrame:NSMakeRect(rx,ry+25,cell,21)];index++;}
|
||||
CGFloat ax=shape?w-side-8:8,aw=shape?side:left,ay=top;
|
||||
if(pen){CGFloat bw=(aw-8)/2;_penRedraw.frame=NSMakeRect(ax,ay,bw,30);_penFinish.frame=NSMakeRect(ax+bw+8,ay,bw,30);_penCancel.frame=NSMakeRect(ax,ay+36,aw,30);ay+=80;}
|
||||
if(shape){_trackingTitle.frame=NSMakeRect(ax,ay+2,aw,20);ay+=28;CGFloat bw=(aw-8)/2;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(ax+(i%2)*(bw+8),ay+(i/2)*34,bw,30)];ay+=106;_clear.frame=NSMakeRect(ax,ay,aw,30);ay+=40;}
|
||||
else ay=top+ceil(double(index)/columns)*50+8;
|
||||
_status.frame=NSMakeRect(ax,ay+2,aw,54);return;
|
||||
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,24)];[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;
|
||||
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
|
||||
// hold both; no vertical clipping and no hidden controls below the viewport.
|
||||
if(y+32>h){x+=216;y=42;}_status.font=[NSFont systemFontOfSize:10];_status.frame=NSMakeRect(x,y,aw,MIN(54,MAX(26,h-y-4)));return;
|
||||
}
|
||||
_eye.frame=NSMakeRect(0,4,32,34);_list.frame=NSMakeRect(38,4,MAX(60,w-114),34);_add.frame=NSMakeRect(w-70,4,32,34);_remove.frame=NSMakeRect(w-32,4,32,34);
|
||||
CGFloat combineWidth=MIN(112,MAX(90,w*.45));_combine.frame=NSMakeRect(0,46,combineWidth,34);_invert.frame=NSMakeRect(combineWidth+12,49,MAX(70,w-combineWidth-12),28);_canvas.frame=NSMakeRect(0,88,w,36);
|
||||
|
||||
在新工单中引用
屏蔽一个用户