Implement adaptive inspector and responsive canvas controls for 1.12.1
这个提交包含在:
1 父节点
91b66eb2d8
当前提交
585c83c8a1
21 个文件已更改
+316
-68
没有与搜索条件相匹配的文件
@@ -1,8 +1,25 @@
|
||||
// One OSC root owns a lower-left tool rail and independent movable editors.
|
||||
// One OSC root owns a lower-right tool rail and independent movable editors.
|
||||
// Positions are view state; opening, moving and channel selection never edit a grade.
|
||||
#import "DYTheme.h"
|
||||
#include "DYViewerParameterPanel.inc.h"
|
||||
static const NSInteger DYViewerPartBase=20000;
|
||||
static void DYDrawDistortionGrid(NSRect rect,NSColor *color){
|
||||
CGFloat side=MIN(rect.size.width,rect.size.height);
|
||||
auto point=[&](CGFloat x,CGFloat y){
|
||||
CGFloat scale=side*(.34+.075*(x*x+y*y));
|
||||
return NSMakePoint(NSMidX(rect)+scale*x,NSMidY(rect)+scale*y);
|
||||
};
|
||||
NSBezierPath *grid=[NSBezierPath bezierPath];
|
||||
grid.lineWidth=MAX(.75,side*.067);
|
||||
for(CGFloat edge:{-1.,0.,1.})for(BOOL vertical:{NO,YES}){
|
||||
for(int i=0;i<=12;i++){
|
||||
CGFloat t=(i-6)/6.;
|
||||
NSPoint p=vertical?point(edge,t):point(t,edge);
|
||||
if(i==0)[grid moveToPoint:p];else [grid lineToPoint:p];
|
||||
}
|
||||
}
|
||||
[color setStroke];[grid stroke];
|
||||
}
|
||||
@interface DYViewerControls : NSObject
|
||||
@property(nonatomic,retain) DYViewerParameterBridge *bridge;
|
||||
- (void)setViewport:(NSRect)viewport;
|
||||
@@ -34,11 +51,12 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
if(_capture&&![_capture capturing])_capture=nil;
|
||||
[_areas removeAllObjects];if(!_bridge||v.size.width<100||v.size.height<80)return;
|
||||
// Only tools that benefit from direct image interaction belong on the canvas.
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look"],*titles=@[@"曲线",@"畸变",@"肤色",@"LUT"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"camera.aperture",@"person.crop.circle",@"square.stack.3d.up"];
|
||||
CGFloat railScale=MIN(s,MIN((v.size.width-24)/388.,(v.size.height-16)/27.));CGFloat x=NSMinX(v)+8*railScale,y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
_rail=NSMakeRect(x,y,276*railScale,25*railScale);
|
||||
NSArray *types=@[@"curve",@"lens",@"skin",@"look",@"whiteBalance"],*titles=@[@"曲线",@"畸变修复",@"肤色",@"LUT",@"白平衡吸管"],*symbols=@[@"point.topleft.down.to.point.bottomright.curvepath",@"pincushion-grid",@"person.crop.circle",@"square.stack.3d.up",@"eyedropper"];
|
||||
CGFloat railScale=MIN(s,v.size.width/440.),y=NSMaxY(v)-33*railScale,w=36*railScale;
|
||||
CGFloat x=NSMaxX(v)-436*railScale;
|
||||
_rail=NSMakeRect(x,y,316*railScale,25*railScale);
|
||||
for(NSInteger i=0;i<3;i++)[_areas addObject:@{@"part":@(20010+i),@"kind":@"mask",@"index":@([@[@1,@0,@2][i]integerValue]),@"title":@[@"矩形",@"椭圆",@"钢笔"][i],@"symbol":@[@"rectangle",@"circle",@"pencil.tip"][i],@"rect":[NSValue valueWithRect:NSMakeRect(x+i*40*railScale,y,w,25*railScale)]}];
|
||||
for(NSInteger i=0;i<4;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
|
||||
for(NSInteger i=0;i<types.count;i++)[_areas addObject:@{@"part":@(20020+i),@"kind":@"tool",@"toolType":types[i],@"title":titles[i],@"symbol":symbols[i],@"rect":[NSValue valueWithRect:NSMakeRect(x+(i+3)*40*railScale,y,w,25*railScale)]}];
|
||||
CGFloat buttonWidth=100*railScale,buttonHeight=27*railScale;
|
||||
[_areas addObject:@{@"part":@20001,@"kind":@"workspace",@"title":@"控制面板",@"rect":[NSValue valueWithRect:NSMakeRect(NSMaxX(v)-buttonWidth-8*railScale,NSMaxY(v)-buttonHeight-8*railScale,buttonWidth,buttonHeight)]}];
|
||||
}
|
||||
@@ -71,7 +89,18 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
for(NSDictionary*a in _areas){NSRect r=[a[@"rect"]rectValue];BOOL selected=[a[@"toolType"]isEqual:@"skin"]&&[self skinPreviewEnabled];for(DYViewerParameterPanel*p in _panels)if([p.toolType isEqual:a[@"toolType"]])selected=YES;
|
||||
BOOL hover=_hover==[a[@"part"]integerValue];
|
||||
BOOL pressed=_pressed==[a[@"part"]integerValue];DYDrawSoftControl(r,4*s,NO,selected||hover,pressed);
|
||||
if(a[@"symbol"]){NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[selected?NSColor.systemCyanColor:NSColor.whiteColor]]];icon=[icon imageWithSymbolConfiguration:configuration];CGFloat side=MIN(17*s,r.size.height-6*s);[icon drawInRect:NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];continue;}
|
||||
if(a[@"symbol"]){
|
||||
NSColor *ink=selected?NSColor.systemCyanColor:NSColor.whiteColor;
|
||||
CGFloat side=MIN(17*s,r.size.height*.7);
|
||||
NSRect glyph=NSMakeRect(NSMidX(r)-side/2,NSMidY(r)-side/2,side,side);
|
||||
if([a[@"symbol"]isEqual:@"pincushion-grid"])DYDrawDistortionGrid(NSInsetRect(glyph,1,1),ink);
|
||||
else{
|
||||
NSImage *icon=[NSImage imageWithSystemSymbolName:a[@"symbol"] accessibilityDescription:a[@"title"]];
|
||||
NSImageSymbolConfiguration *configuration=[[NSImageSymbolConfiguration configurationWithPointSize:14*s weight:NSFontWeightRegular]configurationByApplyingConfiguration:[NSImageSymbolConfiguration configurationWithPaletteColors:@[ink]]];
|
||||
[[icon imageWithSymbolConfiguration:configuration]drawInRect:glyph fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
}
|
||||
continue;
|
||||
}
|
||||
// The bottom workspace entry keeps its explicit text label.
|
||||
NSMutableParagraphStyle*style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.alignment=NSTextAlignmentCenter;
|
||||
NSShadow *shadow=[[[NSShadow alloc]init]autorelease];shadow.shadowColor=[NSColor colorWithWhite:0 alpha:.95];shadow.shadowBlurRadius=2;shadow.shadowOffset=NSMakeSize(0,-1);
|
||||
@@ -79,16 +108,16 @@ NSRect bounds=NSMakeRect(0,0,size.width,size.height),v=_hasViewport?NSIntersecti
|
||||
[a[@"title"]drawInRect:NSInsetRect(r,1,MAX(1.,(r.size.height-fontSize-3)/2)) withAttributes:attributes];
|
||||
if(selected){NSBezierPath *mark=[NSBezierPath bezierPath];[mark moveToPoint:NSMakePoint(NSMinX(r),NSMidY(r)-3*s)];[mark lineToPoint:NSMakePoint(NSMinX(r),NSMidY(r)+3*s)];[NSColor.systemCyanColor setStroke];mark.lineWidth=2*s;[mark stroke];}
|
||||
}
|
||||
for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMaxX(r)+6*s,NSMinY(r),72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;}
|
||||
for(NSDictionary *a in _areas)if(a[@"symbol"]&&_hover==[a[@"part"]integerValue]){NSRect r=[a[@"rect"]rectValue],tip=NSMakeRect(NSMidX(r)-36*s,NSMinY(r)-28*s,72*s,25*s);DYDrawSoftControl(tip,4*s,NO,NO,NO);[a[@"title"]drawInRect:NSInsetRect(tip,5*s,5*s)withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10*s],NSForegroundColorAttributeName:NSColor.whiteColor}];break;}
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
- (void)activateTool:(NSString*)type{
|
||||
if([type isEqual:@"look"]){[_bridge requestWorkspacePage:@"lut"];return;}
|
||||
if([type isEqual:@"skin"]){[self toggleSkinPreview];return;}
|
||||
if([type isEqual:@"whiteBalance"]){[_bridge requestWhiteBalanceAtTime:_time];return;}
|
||||
for(DYViewerParameterPanel*p in [[_panels copy]autorelease])if([p.toolType isEqual:type]){[p finishCapture];p.bridge=nil;[_panels removeObjectIdenticalTo:p];return;}
|
||||
[_bridge requestTool:type];DYViewerParameterPanel*p=[[[DYViewerParameterPanel alloc]init]autorelease];p.toolType=type;p.bridge=_bridge;
|
||||
CGFloat x=16*_scale/MAX(1.,_viewport.size.width),offset=0;
|
||||
[p setInitialPosition:NSMakePoint(x+offset/MAX(1.,_viewport.size.width),(8*_scale+offset)/MAX(1.,_viewport.size.height))];[_panels addObject:p];
|
||||
[_panels addObject:p];
|
||||
}
|
||||
- (BOOL)event:(NSEventType)type point:(NSPoint)p atTime:(CMTime)time{
|
||||
if(!std::isfinite(p.x)||!std::isfinite(p.y))return NO;[self prepareWithSize:_size scale:_scale atTime:time];
|
||||
|
||||
在新工单中引用
屏蔽一个用户