From 5e94042db91dd2f88f145c0f50d0613c874253d9 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 1 Nov 2026 20:44:15 +0800 Subject: [PATCH] WIP: visible primary balance reset, Sony input default, resizable LUT browser layout and recent history; host validation pending --- 大鱼调色/Plugin/DYDiagnostics.mm | 10 +- 大鱼调色/Plugin/DYInspector.mm | 33 ++++-- 大鱼调色/Plugin/DYLUTBrowser.h | 3 + 大鱼调色/Plugin/DYLUTBrowser.mm | 138 +++++++++++++++++------- 大鱼调色/Plugin/DYLUTLibrary.h | 4 + 大鱼调色/Plugin/DYLUTLibrary.mm | 27 +++++ 大鱼调色/Plugin/DYModel.mm | 2 +- 大鱼调色/Plugin/DYNewPanels.inc.h | 12 ++- 大鱼调色/Plugin/Info.plist | 4 +- 大鱼调色/Wrapper Application/Info.plist | 4 +- 10 files changed, 178 insertions(+), 59 deletions(-) diff --git a/大鱼调色/Plugin/DYDiagnostics.mm b/大鱼调色/Plugin/DYDiagnostics.mm index 13881e4..ed5a4a5 100644 --- a/大鱼调色/Plugin/DYDiagnostics.mm +++ b/大鱼调色/Plugin/DYDiagnostics.mm @@ -168,6 +168,7 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { for(NSDictionary *row in descriptors)if([row[@"offset"]integerValue]>=0){float value=*field(&defaults,row);finite&=std::isfinite(value);matches&=value==[row[@"default"]floatValue];} for(int c=0;c<3;c++)finite&=std::isfinite(defaults.primariesM0[c])&&std::isfinite(defaults.primariesM1[c])&&std::isfinite(defaults.primariesM2[c]); run.need(@"finite-real-model-defaults",finite&&matches); + run.record(@"new-input-default-sony-slog3-sgamut3-cine",defaults.cm.inputTransfer==28&&defaults.cm.inputGamut==27&&defaults.cm.outputTransfer==1002&&defaults.cm.outputGamut==22); bool initialGroups=true; for(NSDictionary *section in sections){BOOL base=YES;for(NSDictionary *row in descriptors)if([row[@"pid"]isEqual:section[@"enabled"]])initialGroups&=([row[@"default"]doubleValue]>=.5)==base;} run.record(@"all-module-eyes-enabled-by-default",initialGroups); @@ -220,7 +221,11 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { float expectedStrength=hypotf(10,4)/90.f,expectedAngle=fmodf(atan2f(4,10)*180/M_PI+360-104,360); run.record(@"balance-wheel-reference-orientation-and-fine-drag",fabs(uiAfter.cm.balanceStrength-expectedStrength)<1e-5&&fabs(uiAfter.cm.balanceAngle-expectedAngle)<1e-4&&uiAfter.cm.balanceAngle>1,@{@"angleDegrees":@(uiAfter.cm.balanceAngle),@"strength":@(uiAfter.cm.balanceStrength)}); run.record(@"balance-drag-one-host-undo-group",uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1&&!uiHost->_undoActive); - [wheel mouseDown:mouseFor(wheel,NSEventTypeLeftMouseDown,wheelCenter,0,2)];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);run.record(@"balance-double-click-neutral",uiAfter.cm.balanceStrength==0); + NSButton *balanceReset=[wheel valueForKey:@"reset"];run.need(@"balance-visible-reset-button",[balanceReset.title isEqual:@"复位"]&&[balanceReset.accessibilityLabel isEqual:@"复位一级白平衡"]); + DYUniforms beforeReset=uiAfter;starts=uiHost->_undoStarts;ends=uiHost->_undoEnds;[balanceReset performClick:nil];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter); + DYUniforms resetExpected=beforeReset;resetExpected.cm.balanceAngle=0;resetExpected.cm.balanceStrength=0; + run.record(@"balance-button-resets-only-wheel-one-undo",memcmp(&resetExpected,&uiAfter,sizeof(uiAfter))==0&&uiHost->_undoStarts==starts+1&&uiHost->_undoEnds==ends+1); + [wheel mouseDown:mouseFor(wheel,NSEventTypeLeftMouseDown,wheelCenter,0,2)];DYReadUniforms(uiHost,kCMTimeZero,&uiAfter);run.record(@"balance-double-click-neutral",uiAfter.cm.balanceStrength==0&&uiAfter.cm.balanceAngle==0); NSView *spiderPanel=[inspector valueForKey:@"spiderPanel"];NSView *disc=(id)[spiderPanel valueForKey:@"disc"];[disc setFrameSize:NSMakeSize(310,300)];auto initialMesh=DYSpiderMesh(disc.meshData); run.record(@"spider-default-six-by-six-31-nodes",initialMesh.hues==6&&initialMesh.rings==5&&dy::meshCount(initialMesh)==31); auto selectNode=[&](int index,NSEventModifierFlags flags){NSPoint pt=[disc point:index];[disc mouseDown:mouseFor(disc,NSEventTypeLeftMouseDown,pt,flags)];[disc mouseUp:mouseFor(disc,NSEventTypeLeftMouseUp,pt,flags)];}; @@ -244,6 +249,9 @@ extern "C" int DYRunDiagnostics(void) { @autoreleasepool { run.need(@"real-iosurface-image-tiles",source&&destination&&source.ioSurface&&destination.ioSurface); Pixels input(width*height*4);for(NSUInteger y=0;y a=[self actionAPI];if(!a)return;[a startAction:self];NSString *selected=nil;@try{selected=[DYReadAssets(_manager,a.currentTime).paths[sender.identifier]copy];}@finally{[a endAction:self];} __block DYInspector *owner=self;NSString *key=[[sender.identifier copy]autorelease]; _browser=[[DYLUTBrowser alloc]initWithLibrary:_library preview:[_renderer lookLUTPreview] selectedPath:selected palette:DYThemePalette() selection:^NSProgress *(NSString *path,void (^completion)(NSError *)){return [owner setAssetPath:path forKey:key completion:completion];}];[selected release]; - id remote=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)]; - if(!remote)remote=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v2)];if(!remote)remote=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI)]; - DYLUTBrowser *browser=_browser;id closer=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)]; - if(remote){[remote remoteWindowOfSize:CGSizeMake(760,560) reply:^(FxXPView *parent,NSError *error){dispatch_async(dispatch_get_main_queue(),^{ - if(_browser!=browser)return; - if(parent){[browser showInRemoteParent:parent close:^{[closer closeRemoteWindow];}];} - else [browser showRelativeToView:sender]; - });}];}else [browser showRelativeToView:sender]; + // Remote-window APIs must be acquired and invoked inside the custom + // parameter action, while the SDK's API permissions are still installed. + [a startAction:self]; + @try{ + id v3=[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v3)]; + id sizable=v3?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI_v2)]; + id remote=sizable?:[_manager apiForProtocol:@protocol(FxRemoteWindowAPI)]; + DYLUTBrowser *browser=_browser; + void (^attach)(FxXPView *,NSError *)=^(FxXPView *parent,NSError *error){ + void (^views)(void)=^{ + if(owner->_browser!=browser)return; + if(parent)[browser showInRemoteParent:parent close:^{ + id action=[owner actionAPI];if(!action)return;[action startAction:owner]; + @try{[v3 closeRemoteWindow];}@finally{[action endAction:owner];} + }];else [browser showRelativeToView:sender]; + }; + // Attach before reply returns: the SDK immediately reads child size. + if(NSThread.isMainThread)views();else dispatch_sync(dispatch_get_main_queue(),views); + }; + if(sizable)[sizable remoteWindowWithMinimumSize:DYLUTBrowser.minimumContentSize maximumSize:DYLUTBrowser.maximumContentSize reply:attach]; + else if(remote)[remote remoteWindowOfSize:DYLUTBrowser.preferredContentSize reply:attach]; + else [_browser showRelativeToView:sender]; + }@finally{[a endAction:self];} } - (void)lookEnabled:(NSButton *)sender {NSInteger slot=[[sender.identifier substringFromIndex:4]integerValue];if(slot<1||slot>4)return;[self writeGraphicValues:@{[NSString stringWithFormat:@"look%ldEnabled",(long)slot+1]:@(sender.state==NSControlStateValueOn)}];} - (void)openLibraryFolder:(id)sender { @@ -983,7 +998,7 @@ static NSImage *DYWheelImage(void) { if(path.length)paths[key]=path;else [paths removeObjectForKey:key]; assets.paths=paths;written=DYWriteAssets(_manager,assets,t); } @finally {[action endAction:self];} - if(written)[self postChanged];else if(error)*error=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:@"宿主未接受此 LUT,原来的选择已保留"}]; + if(written){if(path.length&&[key hasPrefix:@"look"])[_library recordUsedPath:path];[self postChanged];}else if(error)*error=[NSError errorWithDomain:@"com.dayu.color" code:1 userInfo:@{NSLocalizedDescriptionKey:@"宿主未接受此 LUT,原来的选择已保留"}]; return written; } - (void)showError:(NSString *)message { diff --git a/大鱼调色/Plugin/DYLUTBrowser.h b/大鱼调色/Plugin/DYLUTBrowser.h index caebbd3..cff58cd 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.h +++ b/大鱼调色/Plugin/DYLUTBrowser.h @@ -7,6 +7,9 @@ typedef NSProgress * (^DYLUTSelectionHandler)(NSString *path,void (^completion)( /// after decoding, GPU preparation and the host edit have actually succeeded. @interface DYLUTBrowser : NSWindowController @property(nonatomic,readonly) BOOL visible; ++ (NSSize)minimumContentSize; ++ (NSSize)maximumContentSize; ++ (NSSize)preferredContentSize; - (instancetype)initWithLibrary:(DYLUTLibrary *)library preview:(NSData *)rgba selectedPath:(NSString *)path diff --git a/大鱼调色/Plugin/DYLUTBrowser.mm b/大鱼调色/Plugin/DYLUTBrowser.mm index 3493ab6..20a16d1 100644 --- a/大鱼调色/Plugin/DYLUTBrowser.mm +++ b/大鱼调色/Plugin/DYLUTBrowser.mm @@ -15,6 +15,11 @@ static NSColor *DYBrowserColor(NSDictionary *palette, NSString *key) { static NSString *const DYBrowserSizePreference=@"com.dayu.color.lookLUTPreview.thumbnailSize"; static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview.selectedFolder"; +static NSString *const DYBrowserFramePreference=@"com.dayu.color.lookLUTPreview.windowFrame"; +static NSString *const DYBrowserLayoutPreference=@"com.dayu.color.lookLUTPreview.layout"; +static NSString *const DYBrowserSidebarPreference=@"com.dayu.color.lookLUTPreview.sidebarWidth"; +static NSString *const DYBrowserRecentFolder=@"@recent"; +static NSString *DYBrowserPreference(NSString *key,DYLUTLibrary *library){return [NSString stringWithFormat:@"%@|%@",key,library.rootURL.path];} @interface DYBrowserCanvas : NSView @property(copy) NSDictionary *palette; @@ -41,6 +46,7 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview @property(copy) NSDictionary *palette; @property BOOL chosen; @property BOOL doubleClicked; +@property BOOL listLayout; @end @implementation DYBrowserTile - (BOOL)isFlipped{return YES;} @@ -56,7 +62,7 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview NSRect bounds=NSInsetRect(self.bounds,1,1); NSBezierPath *outline=[NSBezierPath bezierPathWithRoundedRect:bounds xRadius:7 yRadius:7]; [DYBrowserColor(_palette,_chosen?@"field":@"card") setFill];[outline fill]; - NSRect imageRect=NSMakeRect(2,2,MAX(1,bounds.size.width-2),MAX(1,bounds.size.height-25)); + NSRect imageRect=_listLayout?NSMakeRect(3,3,104,bounds.size.height-4):NSMakeRect(2,2,MAX(1,bounds.size.width-2),MAX(1,bounds.size.height-25)); if(_thumbnail){ [NSGraphicsContext saveGraphicsState]; [[NSBezierPath bezierPathWithRoundedRect:imageRect xRadius:4 yRadius:4]addClip]; @@ -71,8 +77,8 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview NSSize size=[message sizeWithAttributes:attributes]; [message drawAtPoint:NSMakePoint(NSMidX(imageRect)-size.width/2,NSMidY(imageRect)-size.height/2) withAttributes:attributes]; } - NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.alignment=NSTextAlignmentCenter;paragraph.lineBreakMode=NSLineBreakByTruncatingMiddle; - [_displayName drawInRect:NSMakeRect(7,NSMaxY(bounds)-24,bounds.size.width-14,18) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:11 weight:_chosen?NSFontWeightSemibold:NSFontWeightRegular],NSForegroundColorAttributeName:DYBrowserColor(_palette,@"text"),NSParagraphStyleAttributeName:paragraph}]; + NSMutableParagraphStyle *paragraph=[[[NSMutableParagraphStyle alloc]init]autorelease];paragraph.alignment=_listLayout?NSTextAlignmentLeft:NSTextAlignmentCenter;paragraph.lineBreakMode=NSLineBreakByTruncatingMiddle; + [_displayName drawInRect:(_listLayout?NSMakeRect(120,NSMidY(bounds)-9,MAX(1,bounds.size.width-136),20):NSMakeRect(7,NSMaxY(bounds)-24,bounds.size.width-14,18)) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:11 weight:_chosen?NSFontWeightSemibold:NSFontWeightRegular],NSForegroundColorAttributeName:DYBrowserColor(_palette,@"text"),NSParagraphStyleAttributeName:paragraph}]; [DYBrowserColor(_palette,_chosen?@"accent":@"border")setStroke];outline.lineWidth=_chosen?2:1;[outline stroke]; } - (void)mouseDown:(NSEvent *)event{self.doubleClicked=event.clickCount>1;[super mouseDown:event];} @@ -100,7 +106,7 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview @end @implementation DYBrowserWork @end -@interface DYLUTBrowser () { +@interface DYLUTBrowser () { DYLUTLibrary *_library; NSData *_preview; NSString *_selectedPath,*_folder; @@ -108,6 +114,7 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview DYLUTSelectionHandler _selection; void (^_closeAction)(void); NSPopover *_popover; + NSWindow *_presentationWindow;NSSplitView *_splitView;NSPopUpButton *_layoutMenu; DYBrowserCanvas *_root,*_folderDocument,*_gridDocument; NSScrollView *_folderScroll,*_gridScroll; NSTextField *_titleLabel,*_countLabel,*_statusLabel,*_sizeLabel,*_emptyLabel; @@ -121,25 +128,35 @@ static NSString *const DYBrowserFolderPreference=@"com.dayu.color.lookLUTPreview NSCache *_thumbnailCache; dispatch_queue_t _previewQueue; DYBrowserWork *_work; - BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut; + BOOL _closed,_sizing,_visible,_remoteMode,_importing,_layingOut,_detached; NSProgress *_libraryTask,*_selectionTask; NSTimer *_progressTimer; NSUInteger _libraryGeneration,_selectionGeneration; NSInteger _columns; - CGFloat _tileWidth,_tileHeight; + CGFloat _tileWidth,_tileHeight,_sidebarWidth; } @end @implementation DYLUTBrowser ++ (NSSize)minimumContentSize{return NSMakeSize(720,420);} ++ (NSSize)maximumContentSize{return NSMakeSize(1800,1200);} ++ (NSSize)preferredContentSize{ + NSString *key=[NSString stringWithFormat:@"%@|%@",DYBrowserFramePreference,DYLUTLibrary.defaultRootURL.path]; + NSString *saved=[[NSUserDefaults standardUserDefaults]stringForKey:key];NSRect frame=saved?NSRectFromString(saved):NSZeroRect; + if(!std::isfinite(frame.size.width)||!std::isfinite(frame.size.height)||frame.size.width<720||frame.size.height<420)return NSMakeSize(900,620); + return NSMakeSize(MIN(1800,frame.size.width),MIN(1200,MAX(420,frame.size.height-28))); +} static NSTextField *BrowserLabel(NSString *title,CGFloat size){NSTextField *label=[NSTextField labelWithString:title];label.font=[NSFont systemFontOfSize:size];label.lineBreakMode=NSLineBreakByTruncatingTail;return label;} static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *button=[NSButton buttonWithTitle:title target:target action:action];button.font=[NSFont systemFontOfSize:11];button.bezelStyle=NSBezelStyleRounded;return button;} - (instancetype)initWithLibrary:(DYLUTLibrary *)library preview:(NSData *)rgba selectedPath:(NSString *)path palette:(NSDictionary *)palette selection:(DYLUTSelectionHandler)selection{ NSPanel *panel=[[[NSPanel alloc]initWithContentRect:NSMakeRect(0,0,760,560) styleMask:NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable backing:NSBackingStoreBuffered defer:NO]autorelease]; if((self=[super initWithWindow:panel])){ - NSString *savedFolder=[[NSUserDefaults standardUserDefaults]stringForKey:DYBrowserFolderPreference]; + NSString *savedFolder=[[NSUserDefaults standardUserDefaults]stringForKey:DYBrowserPreference(DYBrowserFolderPreference,library)]?:[[NSUserDefaults standardUserDefaults]stringForKey:DYBrowserFolderPreference]; + if(!library.recentPaths.count&&path.length)[library recordUsedPath:path]; + if(!savedFolder)savedFolder=library.recentPaths.count?DYBrowserRecentFolder:@"*"; _library=[library retain];_preview=[rgba copy];_selectedPath=[path copy];_folder=[(savedFolder?:@"*") copy];_selection=[selection copy]; _folderButtons=[NSMutableArray new];_tiles=[NSMutableDictionary new];_queuedPaths=[NSMutableSet new];_thumbnailCache=[NSCache new];_thumbnailCache.countLimit=600;_thumbnailCache.totalCostLimit=64*1024*1024;_previewQueue=dispatch_queue_create("com.dayu.color.lut-thumbnails",DISPATCH_QUEUE_SERIAL);dispatch_set_target_queue(_previewQueue,dispatch_get_global_queue(QOS_CLASS_UTILITY,0)); - panel.title=@"风格 LUT";panel.minSize=NSMakeSize(760,420);panel.releasedWhenClosed=NO;panel.hidesOnDeactivate=NO;panel.delegate=self; + panel.title=@"风格 LUT";panel.contentMinSize=self.class.minimumContentSize;panel.contentMaxSize=self.class.maximumContentSize;panel.releasedWhenClosed=NO;panel.hidesOnDeactivate=NO;panel.delegate=self; _root=[[DYBrowserCanvas alloc]initWithFrame:NSMakeRect(0,0,760,560)];_root.accessibilityLabel=@"LUT 缩略图浏览库";panel.contentView=_root; _titleLabel=[BrowserLabel(@"LUT 文件夹",14)retain];_titleLabel.font=[NSFont systemFontOfSize:14 weight:NSFontWeightSemibold]; _countLabel=[BrowserLabel(@"0 个 LUT",11)retain]; @@ -153,7 +170,11 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b _refresh=[BrowserButton(@"刷新",self,@selector(reloadLibrary:))retain]; _none=[BrowserButton(@"无 LUT",self,@selector(clearSelection:))retain]; _done=[BrowserButton(@"完成",self,@selector(done:))retain];_done.keyEquivalent=@"\r"; - double size=[[NSUserDefaults standardUserDefaults]objectForKey:DYBrowserSizePreference]?[[NSUserDefaults standardUserDefaults]doubleForKey:DYBrowserSizePreference]:96; + NSUserDefaults *preferences=NSUserDefaults.standardUserDefaults; + NSNumber *storedSize=[preferences objectForKey:DYBrowserPreference(DYBrowserSizePreference,library)]?:[preferences objectForKey:DYBrowserSizePreference];double size=storedSize?storedSize.doubleValue:120; + _layoutMenu=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_layoutMenu addItemsWithTitles:@[@"网格",@"列表"]];_layoutMenu.font=[NSFont systemFontOfSize:11];_layoutMenu.target=self;_layoutMenu.action=@selector(layoutChanged:);_layoutMenu.accessibilityLabel=@"LUT 浏览布局"; + [_layoutMenu selectItemAtIndex:[preferences integerForKey:DYBrowserPreference(DYBrowserLayoutPreference,library)]==1?1:0]; + double sidebar=[preferences doubleForKey:DYBrowserPreference(DYBrowserSidebarPreference,library)];_sidebarWidth=std::isfinite(sidebar)&&sidebar>=128?MIN(360,sidebar):162; if(!std::isfinite(size))size=96; _sizeSlider=[[NSSlider alloc]initWithFrame:NSZeroRect];_sizeSlider.minValue=70;_sizeSlider.maxValue=255;_sizeSlider.doubleValue=fmax(70,fmin(255,size));_sizeSlider.continuous=YES;_sizeSlider.target=self;_sizeSlider.action=@selector(sizeChanged:);_sizeSlider.accessibilityLabel=@"LUT 缩略图大小"; _folderScroll=[[NSScrollView alloc]initWithFrame:NSZeroRect];_folderScroll.hasVerticalScroller=YES;_folderScroll.autohidesScrollers=YES;_folderScroll.borderType=NSNoBorder;_folderScroll.drawsBackground=NO;_folderScroll.accessibilityLabel=@"LUT 文件夹列表"; @@ -164,12 +185,14 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(folderScrolled:) name:NSViewBoundsDidChangeNotification object:_folderScroll.contentView]; _gridScroll.contentView.postsBoundsChangedNotifications=YES; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(gridScrolled:) name:NSViewBoundsDidChangeNotification object:_gridScroll.contentView]; - for(NSView *view in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_sizeSlider,_folderScroll,_gridScroll])[_root addSubview:view]; + _splitView=[[NSSplitView alloc]initWithFrame:NSMakeRect(12,80,736,425)];_splitView.vertical=YES;_splitView.dividerStyle=NSSplitViewDividerStyleThin;_splitView.accessibilityLabel=@"调整 LUT 文件夹与预览宽度"; + _folderScroll.frame=NSMakeRect(0,0,162,425);_gridScroll.frame=NSMakeRect(163,0,573,425);[_splitView addSubview:_folderScroll];[_splitView addSubview:_gridScroll]; + for(NSView *view in @[_titleLabel,_countLabel,_statusLabel,_sizeLabel,_search,_importFiles,_importFolder,_reveal,_refresh,_none,_done,_sizeSlider,_layoutMenu,_splitView])[_root addSubview:view]; [_gridDocument addSubview:_emptyLabel]; _root.postsFrameChangedNotifications=YES;_root.postsBoundsChangedNotifications=YES; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(browserRootResized:) name:NSViewFrameDidChangeNotification object:_root]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(browserRootResized:) name:NSViewBoundsDidChangeNotification object:_root]; - [self reloadLibrary:nil];[self updatePalette:palette];[self layoutBrowser]; + _splitView.delegate=self;[self reloadLibrary:nil];[self updatePalette:palette];[self layoutBrowser]; } return self; } @@ -181,40 +204,65 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b [_library release];[_preview release];[_selectedPath release];[_folder release];[_palette release];[_selection release];[_closeAction release]; [_root release];[_folderDocument release];[_gridDocument release];[_folderScroll release];[_gridScroll release]; [_titleLabel release];[_countLabel release];[_statusLabel release];[_sizeLabel release];[_emptyLabel release];[_search release]; - [_importFiles release];[_importFolder release];[_reveal release];[_refresh release];[_none release];[_done release];[_sizeSlider release]; + [_importFiles release];[_importFolder release];[_reveal release];[_refresh release];[_none release];[_done release];[_sizeSlider release];[_layoutMenu release];_splitView.delegate=nil;[_splitView release];[_presentationWindow release]; [_folderButtons release];[_folderPaths release];[_tiles release];[_visibleEntries release];[_queuedPaths release];[_thumbnailCache release]; dispatch_release(_previewQueue);[super dealloc]; } - (void)showRelativeToView:(NSView *)view{ - if(_closed||_remoteMode||!view.window)return; - if(_popover.shown)return; - // A plug-in process is prohibited from making its own NSPanel key. Only - // FxRemoteWindow or a host-anchored popover may present this content. + if(_closed||_remoteMode||!view.window||_popover.shown)return; self.window.contentView=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,1,1)]autorelease]; - [_root removeFromSuperview];_root.frame=NSMakeRect(0,0,760,560);_root.autoresizingMask=NSViewWidthSizable|NSViewHeightSizable; - _popover=[[NSPopover alloc]init];_popover.behavior=NSPopoverBehaviorTransient;_popover.animates=YES;_popover.delegate=self;_popover.contentSize=NSMakeSize(760,560); - NSViewController *controller=[[[NSViewController alloc]init]autorelease];controller.view=_root;_popover.contentViewController=controller; + NSSize size=self.class.preferredContentSize;[_root removeFromSuperview];_root.frame=(NSRect){NSZeroPoint,size};_root.autoresizingMask=NSViewWidthSizable|NSViewHeightSizable; + _popover=[[NSPopover alloc]init];_popover.behavior=NSPopoverBehaviorSemitransient;_popover.animates=YES;_popover.delegate=self;_popover.contentSize=size; + NSViewController *controller=[[[NSViewController alloc]init]autorelease];controller.title=@"风格 LUT";controller.view=_root;_popover.contentViewController=controller; [self layoutBrowser]; @try {[_popover showRelativeToRect:view.bounds ofView:view preferredEdge:NSRectEdgeMaxX];_visible=_popover.shown;} @catch(NSException *exception){[self finishClosing];} } -- (BOOL)visible{return !_closed&&(_remoteMode?_visible:_popover.shown);} +- (BOOL)visible{return !_closed&&((_remoteMode||_detached)?_visible:_popover.shown);} - (void)showInRemoteParent:(NSView *)parent close:(void (^)(void))closeAction{ if(_closed||!parent||self.visible)return; _remoteMode=YES;_visible=YES;[_closeAction release];_closeAction=[closeAction copy]; self.window.contentView=[[[NSView alloc]initWithFrame:NSMakeRect(0,0,1,1)]autorelease]; [_root removeFromSuperview];_root.frame=parent.bounds;_root.autoresizingMask=NSViewWidthSizable|NSViewHeightSizable;parent.autoresizesSubviews=YES;_root.hidden=NO; [parent addSubview:_root];[self layoutBrowser];[_root setNeedsDisplay:YES]; + // The SDK reads the first child size as soon as its reply returns. + // Restore geometry only after that first synchronous attachment is complete. + dispatch_async(dispatch_get_main_queue(),^{if(!_closed)[self configurePresentationWindow];}); NSAccessibilityPostNotification(parent,NSAccessibilityLayoutChangedNotification); } +- (void)configurePresentationWindow{ + NSWindow *window=_root.window;if(!window||window==self.window)return; + if(_presentationWindow!=window){[_presentationWindow release];_presentationWindow=[window retain]; + for(NSNotificationName name in @[NSWindowDidMoveNotification,NSWindowDidResizeNotification])[[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(presentationGeometryChanged:) name:name object:window]; + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(presentationWindowClosed:) name:NSWindowWillCloseNotification object:window]; + } + window.title=@"风格 LUT";window.contentMinSize=self.class.minimumContentSize;window.contentMaxSize=self.class.maximumContentSize; + if(_detached)window.styleMask|=NSWindowStyleMaskTitled|NSWindowStyleMaskClosable|NSWindowStyleMaskResizable; + NSString *saved=[NSUserDefaults.standardUserDefaults stringForKey:DYBrowserPreference(DYBrowserFramePreference,_library)]; + NSRect frame=saved?NSRectFromString(saved):[window frameRectForContentRect:(NSRect){window.frame.origin,self.class.preferredContentSize}]; + if(std::isfinite(frame.origin.x)&&std::isfinite(frame.origin.y)&&std::isfinite(frame.size.width)&&std::isfinite(frame.size.height)&&frame.size.width>=720&&frame.size.height>=420){ + NSRect screen=(window.screen?:NSScreen.mainScreen).visibleFrame;frame.size.width=MIN(MAX(720,frame.size.width),MIN(1800,screen.size.width));frame.size.height=MIN(MAX(448,frame.size.height),MIN(1228,screen.size.height)); + frame.origin.x=MAX(NSMinX(screen),MIN(frame.origin.x,NSMaxX(screen)-frame.size.width));frame.origin.y=MAX(NSMinY(screen),MIN(frame.origin.y,NSMaxY(screen)-frame.size.height));[window setFrame:frame display:YES]; + } + [self layoutBrowser]; +} +- (void)presentationGeometryChanged:(NSNotification *)notification{ + if(_closed||!_presentationWindow)return;NSRect frame=_presentationWindow.frame; + if(std::isfinite(frame.size.width)&&std::isfinite(frame.size.height)&&frame.size.width>=720&&frame.size.height>=420)[NSUserDefaults.standardUserDefaults setObject:NSStringFromRect(frame) forKey:DYBrowserPreference(DYBrowserFramePreference,_library)]; + [self layoutBrowser]; +} +- (void)presentationWindowClosed:(NSNotification *)notification{[self finishClosing];} +- (BOOL)popoverShouldDetach:(NSPopover *)popover{return YES;} +- (void)popoverDidDetach:(NSPopover *)popover{_detached=YES;_visible=YES;[self configurePresentationWindow];} - (void)browserRootResized:(NSNotification *)notification{if(!_closed)[self layoutBrowser];} - (void)windowDidResize:(NSNotification *)notification{[self layoutBrowser];} - (void)windowWillClose:(NSNotification *)notification{[self finishClosing];} - (BOOL)popoverShouldClose:(NSPopover *)popover{return !_importing;} -- (void)popoverDidClose:(NSNotification *)notification{[self finishClosing];} +- (void)popoverDidClose:(NSNotification *)notification{if([notification.userInfo[NSPopoverCloseReasonKey]isEqual:NSPopoverCloseReasonDetachToWindow])return;[self finishClosing];} - (void)close{ if(_closed)return; - if(_popover.shown){[_popover close];if(!_closed)[self finishClosing];} + if(_detached&&_presentationWindow){[_presentationWindow performClose:nil];if(!_closed)[self finishClosing];} + else if(_popover.shown){[_popover close];if(!_closed)[self finishClosing];} else [self finishClosing]; } - (void)finishClosing{ @@ -232,25 +280,32 @@ 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,left=162; - _titleLabel.frame=NSMakeRect(12,15,145,20);_countLabel.frame=NSMakeRect(12,39,145,18); - _search.frame=NSMakeRect(left+14,14,MAX(125,w-left-351),24); - _importFiles.frame=NSMakeRect(w-322,12,100,28);_importFolder.frame=NSMakeRect(w-218,12,113,28);_refresh.frame=NSMakeRect(w-101,12,82,28); - _folderScroll.frame=NSMakeRect(12,66,150,MAX(80,h-121));_gridScroll.frame=NSMakeRect(left+12,50,MAX(80,w-left-26),MAX(80,h-105)); - _reveal.frame=NSMakeRect(14,h-44,left-23,27);_none.frame=NSMakeRect(left+13,h-44,75,27); - _sizeLabel.frame=NSMakeRect(left+101,h-39,74,18);_sizeSlider.frame=NSMakeRect(left+173,h-41,MAX(70,MIN(150,w-left-420)),20); + CGFloat w=_root.bounds.size.width,h=_root.bounds.size.height; + _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); + _splitView.frame=NSMakeRect(12,80,MAX(400,w-24),MAX(140,h-135));[_splitView adjustSubviews]; + CGFloat sidebar=MAX(128,MIN(_sidebarWidth,MIN(360,_splitView.bounds.size.width*.45)));[_splitView setPosition:sidebar ofDividerAtIndex:0]; + _reveal.frame=NSMakeRect(w-153,9,139,27);_none.frame=NSMakeRect(14,h-44,75,27);_layoutMenu.frame=NSMakeRect(100,h-44,97,27); + _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); CGFloat fw=MAX(100,_folderScroll.contentSize.width); _folderDocument.frame=NSMakeRect(0,0,fw,MAX(_folderPaths.count*35+4,_folderScroll.contentSize.height)); [self updateVisibleFolders]; CGFloat available=MAX(80,_gridScroll.contentSize.width),tileWidth=_sizeSlider.doubleValue,gap=10; - NSInteger columns=MAX(1,(NSInteger)floor((available+gap)/(tileWidth+gap)));tileWidth=MIN(tileWidth,(available-gap*(columns-1)-14)/columns);tileWidth=MAX(70,tileWidth); - _columns=columns;_tileWidth=tileWidth;_tileHeight=ceil(tileWidth*9/16)+24; + 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; NSInteger rows=(_visibleEntries.count+columns-1)/columns;CGFloat contentHeight=MAX(_gridScroll.contentSize.height,rows*(_tileHeight+gap)+12); _gridDocument.frame=NSMakeRect(0,0,available,contentHeight);_emptyLabel.frame=NSMakeRect(20,MAX(36,_gridScroll.contentSize.height/2-45),MAX(50,available-40),90); _layingOut=NO;[self updateVisibleTiles]; } +- (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]; +} +- (void)layoutChanged:(id)sender{[NSUserDefaults.standardUserDefaults setInteger:_layoutMenu.indexOfSelectedItem forKey:DYBrowserPreference(DYBrowserLayoutPreference,_library)];[self layoutBrowser];} - (void)resetThumbnailWork { _work.cancelled=YES;_work.owner=nil;[_work release];_work=[DYBrowserWork new];_work.owner=self;[_queuedPaths removeAllObjects]; } @@ -263,7 +318,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b for(NSUInteger i=first;i0; [_gridScroll.contentView scrollToPoint:NSZeroPoint];[self layoutBrowser];[_gridScroll reflectScrolledClipView:_gridScroll.contentView]; NSAccessibilityPostNotification(_gridDocument,NSAccessibilityLayoutChangedNotification); @@ -400,7 +458,7 @@ static NSButton *BrowserButton(NSString *title,id target,SEL action){NSButton *b void (^applied)(NSError *)=^(NSError *error){ if(_closed||generation!=_selectionGeneration)return;[_selectionTask release];_selectionTask=nil; if(error){[self setStatus:error.localizedDescription];return;} - [_selectedPath release];_selectedPath=[path copy]; + [_selectedPath release];_selectedPath=[path copy];[_library recordUsedPath:path];[self rebuildGrid]; for(DYBrowserTile *tile in _tiles.allValues){tile.chosen=[tile.identifier isEqualToString:path];[tile setNeedsDisplay:YES];} [self setStatus:[@"已选择 " stringByAppendingString:name]];if(closeAfter)[self close]; }; diff --git a/大鱼调色/Plugin/DYLUTLibrary.h b/大鱼调色/Plugin/DYLUTLibrary.h index 88523ca..04b9437 100644 --- a/大鱼调色/Plugin/DYLUTLibrary.h +++ b/大鱼调色/Plugin/DYLUTLibrary.h @@ -48,6 +48,10 @@ FOUNDATION_EXPORT NSImage * _Nullable DYLUTThumbnail(NSString * _Nullable path, /// Relative folder names, including the root empty string; sorted naturally. @property(nonatomic,readonly,copy) NSArray *folders; @property(nonatomic,readonly,copy) NSSet *favoritePaths; +/// Most recently acknowledged applications, newest first, scoped to this library. +@property(nonatomic,readonly,copy) NSArray *recentPaths; +@property(nonatomic,readonly,copy) NSArray *> *recentEntries; +- (void)recordUsedPath:(NSString *)path; + (NSURL *)defaultRootURL; - (instancetype)init; - (instancetype)initWithRootURL:(NSURL *)rootURL NS_DESIGNATED_INITIALIZER; diff --git a/大鱼调色/Plugin/DYLUTLibrary.mm b/大鱼调色/Plugin/DYLUTLibrary.mm index 6b4a28c..d2ffe6b 100644 --- a/大鱼调色/Plugin/DYLUTLibrary.mm +++ b/大鱼调色/Plugin/DYLUTLibrary.mm @@ -373,6 +373,33 @@ static BOOL DYLUTEnsureDirectory(NSURL *directory,NSURL *root,NSError **error) { - (NSArray *)entries {@synchronized(self){return [[_entries copy]autorelease];}} - (NSArray *)folders {@synchronized(self){return [[_folders copy]autorelease];}} - (NSSet *)favoritePaths {@synchronized(self){return [[_favoritePaths copy]autorelease];}} +- (NSString *)recentPreferenceKey {return [@"com.dayu.color.lookLUTPreview.recentPaths|" stringByAppendingString:_rootURL.path];} +- (NSArray *)recentPaths { + id saved=[[NSUserDefaults standardUserDefaults]objectForKey:[self recentPreferenceKey]]; + NSMutableArray *paths=[NSMutableArray array]; + if([saved isKindOfClass:NSArray.class])for(id path in saved){ + if([path isKindOfClass:NSString.class]&&[path isAbsolutePath]&&[[path pathExtension]caseInsensitiveCompare:@"cube"]==NSOrderedSame&&![paths containsObject:path])[paths addObject:path]; + if(paths.count==40)break; + } + return [[paths copy]autorelease]; +} +- (NSArray *)recentEntries { + NSMutableDictionary *known=[NSMutableDictionary dictionary];for(NSDictionary *entry in self.entries)known[entry[@"path"]]=entry; + NSMutableArray *entries=[NSMutableArray array];for(NSString *path in self.recentPaths){ + NSDictionary *entry=known[path]; + if(!entry)entry=@{@"name":path.lastPathComponent.stringByDeletingPathExtension,@"path":path,@"relativePath":path,@"relativeFolder":@""}; + [entries addObject:entry]; + } + return [[entries copy]autorelease]; +} +- (void)recordUsedPath:(NSString *)path { + if(![path isKindOfClass:NSString.class]||!path.isAbsolutePath||[path.pathExtension caseInsensitiveCompare:@"cube"]!=NSOrderedSame)return; + @synchronized(NSUserDefaults.class){ + NSArray *saved=self.recentPaths;NSMutableArray *next=[[saved mutableCopy]autorelease];[next removeObject:path];[next insertObject:path atIndex:0]; + if(next.count>40)[next removeObjectsInRange:NSMakeRange(40,next.count-40)]; + if(![next isEqual:saved])[[NSUserDefaults standardUserDefaults]setObject:next forKey:[self recentPreferenceKey]]; + } +} - (BOOL)reload:(NSError **)error {return [self reloadProgress:nil error:error];} - (BOOL)reloadProgress:(NSProgress *)progress error:(NSError **)error {@synchronized(_fileLock){ BOOL isDirectory=NO;NSFileManager *fm=NSFileManager.defaultManager; diff --git a/大鱼调色/Plugin/DYModel.mm b/大鱼调色/Plugin/DYModel.mm index ee16e3b..15d6d12 100644 --- a/大鱼调色/Plugin/DYModel.mm +++ b/大鱼调色/Plugin/DYModel.mm @@ -100,7 +100,7 @@ static void initialize(){static dispatch_once_t once;dispatch_once(&once,^{ #define CM(f,t,lo,hi,def,tab) [cm addObject:cmRow(@"cm" #f,t,offsetof(DYCMSettings,f),lo,hi,def,tab)] #define CH(f,t,def,tab,list) [cm addObject:cmRow(@"cm" #f,t,offsetof(DYCMSettings,f),0,1003,def,tab,list)] CM(inputEnabled,@"输入转换启用",0,1,1,0); - CH(inputTransfer,@"输入曲线",1002,0,transfers);CH(inputGamut,@"输入色域",22,0,DYCMGamuts()); + CH(inputTransfer,@"输入曲线",28,0,transfers);CH(inputGamut,@"输入色域",27,0,DYCMGamuts()); CH(workingTransfer,@"工作曲线",10,0,transfers);CH(workingGamut,@"工作色域",16,0,DYCMGamuts()); CM(mix,@"CST 混合",0,1,1,0); CM(basisEnabled,@"一级调色启用",0,1,1,1); diff --git a/大鱼调色/Plugin/DYNewPanels.inc.h b/大鱼调色/Plugin/DYNewPanels.inc.h index 9787427..0c1f798 100644 --- a/大鱼调色/Plugin/DYNewPanels.inc.h +++ b/大鱼调色/Plugin/DYNewPanels.inc.h @@ -47,12 +47,15 @@ @end @implementation DYPrimaryBalanceWheel { NSPoint _offset,_dragStartMouse,_dragStartOffset;BOOL _dragging,_gestureActive; - NSImage *_wheel;float _angle,_strength; + NSImage *_wheel;NSButton *_reset;float _angle,_strength; } -- (instancetype)initWithFrame:(NSRect)frame{if((self=[super initWithFrame:frame])){NSString *path=[[NSBundle bundleForClass:self.class]pathForResource:@"Basis_balanceWheel" ofType:@"png"];if(path)_wheel=[[NSImage alloc]initWithContentsOfFile:path];self.accessibilityLabel=@"一级白平衡色轮";self.toolTip=@"拖动调整一级白平衡(精细移动);双击复位。方向键微调。";}return self;} -- (void)dealloc{[self finishGesture];[_wheel release];[super dealloc];} +- (instancetype)initWithFrame:(NSRect)frame{if((self=[super initWithFrame:frame])){NSString *path=[[NSBundle bundleForClass:self.class]pathForResource:@"Basis_balanceWheel" ofType:@"png"];if(path)_wheel=[[NSImage alloc]initWithContentsOfFile:path];self.accessibilityLabel=@"一级白平衡色轮";self.toolTip=@"拖动调整一级白平衡(精细移动);双击复位。方向键微调。"; + _reset=[DYButton(@"复位",self,@selector(resetBalance:))retain];_reset.accessibilityLabel=@"复位一级白平衡";_reset.toolTip=@"仅复位一级白平衡的方向和强度";[self addSubview:_reset];}return self;} +- (void)dealloc{[self finishGesture];[_wheel release];[_reset release];[super dealloc];} +- (void)layout{[super layout];_reset.frame=NSMakeRect(MAX(0,self.bounds.size.width-62),0,60,24);} - (BOOL)isAccessibilityElement{return YES;} - (NSString *)accessibilityRole{return NSAccessibilityButtonRole;} +- (NSArray *)accessibilityChildren{return @[_reset];} - (NSString *)accessibilityHelp{return self.toolTip;} - (id)accessibilityValue{return [NSString stringWithFormat:@"方向 %.1f 度,强度 %.1f%%",_angle,_strength*100];} - (BOOL)accessibilityPerformPress{[self.window makeFirstResponder:self];return YES;} @@ -62,6 +65,7 @@ - (NSPoint)center{return NSMakePoint(NSMidX(self.bounds),NSMidY(self.bounds)+10);} - (void)setValues:(NSDictionary *)values{_angle=[values[@"cmbalanceAngle"]floatValue];_strength=[values[@"cmbalanceStrength"]floatValue];double angle=(_angle+104)*M_PI/180;_offset=NSMakePoint(cos(angle)*_strength*self.maxDistance,sin(angle)*_strength*self.maxDistance);[self setNeedsDisplay:YES];} - (void)finishGesture{if(_gestureActive){_gestureActive=NO;[_delegate graphicGesture:NO title:@"调整一级白平衡"];}} +- (void)resetBalance:(id)sender{[self finishGesture];_dragging=NO;[_delegate graphicGesture:YES title:@"复位一级白平衡"];_offset=NSZeroPoint;_angle=_strength=0;[_delegate writeGraphicValues:@{@"cmbalanceAngle":@0,@"cmbalanceStrength":@0}];[_delegate graphicGesture:NO title:@"复位一级白平衡"];[self setNeedsDisplay:YES];} - (void)viewWillMoveToWindow:(NSWindow *)w{if(!w)[self finishGesture];[super viewWillMoveToWindow:w];} - (void)pushValue{ _strength=(float)(hypot(_offset.x,_offset.y)/self.maxDistance);_angle=(float)fmod(atan2(_offset.y,_offset.x)*180/M_PI+360-104,360); @@ -71,7 +75,7 @@ [NSColor.whiteColor setFill];[[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(c.x+_offset.x-4,c.y+_offset.y-4,8,8)]fill]; NSString *text=[NSString stringWithFormat:@"一级白平衡 %.1f° · %.1f%%",_angle,_strength*100];[text drawAtPoint:NSMakePoint(8,3) withAttributes:@{NSFontAttributeName:[NSFont systemFontOfSize:10],NSForegroundColorAttributeName:DYInk()}]; } -- (void)mouseDown:(NSEvent *)e{[self.window makeFirstResponder:self];if(e.clickCount==2){[_delegate graphicGesture:YES title:@"还原一级白平衡"];_offset=NSZeroPoint;[self pushValue];[_delegate graphicGesture:NO title:@"还原一级白平衡"];return;} +- (void)mouseDown:(NSEvent *)e{[self.window makeFirstResponder:self];if(e.clickCount==2){[self resetBalance:nil];return;} NSPoint p=[self convertPoint:e.locationInWindow fromView:nil],c=self.center;NSPoint knob=NSMakePoint(c.x+_offset.x,c.y+_offset.y);if(hypot(p.x-knob.x,p.y-knob.y)self.maxDistance){v.x=v.x/length*self.maxDistance;v.y=v.y/length*self.maxDistance;}_offset=v;[self pushValue];} diff --git a/大鱼调色/Plugin/Info.plist b/大鱼调色/Plugin/Info.plist index 7be5d14..e978fda 100644 --- a/大鱼调色/Plugin/Info.plist +++ b/大鱼调色/Plugin/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.3.0 + 1.3.1 CFBundleVersion - 18 + 19 NSHumanReadableCopyright PlugInKit diff --git a/大鱼调色/Wrapper Application/Info.plist b/大鱼调色/Wrapper Application/Info.plist index 43cad0d..d134f02 100644 --- a/大鱼调色/Wrapper Application/Info.plist +++ b/大鱼调色/Wrapper Application/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.0 + 1.3.1 CFBundleVersion - 18 + 19 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSHumanReadableCopyright