// // PSView.m // Perforce // // Created by Adam Czubernat on 06.06.2013. // Copyright (c) 2013 Perforce Software, Inc. All rights reserved. // #import "PSView.h" #import <objc/message.h> @interface PSView () { NSDictionary *targets; NSDictionary *selectors; } - (void)drawImage:(NSRect)dirtyRect; @end @implementation PSView @synthesize backgroundColor, drawingBlock, image, contentMode; - (id)initWithCoder:(NSCoder *)coder { if (self = [super initWithCoder:coder]) { image = [coder decodeObjectForKey:@"image"]; backgroundColor = [coder decodeObjectForKey:@"backgroundColor"]; drawingBlock = [coder decodeObjectForKey:@"drawingBlock"]; contentMode = [[coder decodeObjectForKey:@"contentMode"] intValue]; } return self; } - (void)encodeWithCoder:(NSCoder *)coder { [super encodeWithCoder:coder]; [coder encodeObject:image forKey:@"image"]; [coder encodeObject:backgroundColor forKey:@"backgroundColor"]; [coder encodeObject:drawingBlock forKey:@"drawingBlock"]; [coder encodeObject:@(contentMode) forKey:@"contentMode"]; } - (void)drawRect:(NSRect)dirtyRect { // Draw background if (backgroundColor) { [backgroundColor setFill]; NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver); } // Draw image if (image) [self drawImage:dirtyRect]; // Custom drawing block if (drawingBlock) drawingBlock(self, dirtyRect); } - (void)mouseDown:(NSEvent *)theEvent { PSView *strongSelf = self; [super mouseDown:theEvent]; if ([theEvent clickCount] == 1) { [strongSelf sendActionsForEvents:PSViewEventClick]; } else if ([theEvent clickCount] > 1) { [strongSelf sendActionsForEvents:PSViewEventDoubleClick]; } } // Fix to NSScrollview bottom - (NSRect)adjustScroll:(NSRect)newVisible { CGRect scrollRect = [self enclosingScrollView].frame; if (scrollRect.size.height > self.frame.size.height) { newVisible.origin.y = -scrollRect.size.height + self.frame.size.height; return newVisible; } return [super adjustScroll:newVisible]; } #pragma mark - Private - (void)drawImage:(NSRect)dirtyRect { NSRect drawRect = self.bounds; NSRect imageRect = NSZeroRect; PSViewContentMode mode = contentMode; // Get best size CGSize size = (image.representations.count ? [image bestRepresentationForRect:drawRect context:NULL hints:nil].size : image.size); // Resizable image filling by default if (image.isResizable && mode == PSViewContentModeAspectFit) mode = PSViewContentModeFill; if (mode == PSViewContentModeAspectFit || mode == PSViewContentModeAspectFill) { BOOL max = mode == PSViewContentModeAspectFill; CGFloat factor = (max ? fmax : fmin)(drawRect.size.width / size.width, drawRect.size.height / size.height); size = (CGSize) { size.width * factor, size.height * factor }; drawRect = (CGRect) { trunc((drawRect.size.width - size.width) * 0.5f), trunc((drawRect.size.height - size.height) * 0.5f), size, }; } else if (mode == PSViewContentModeCenter) { imageRect = (CGRect) { trunc((drawRect.size.width - size.width) * 0.5f), trunc((drawRect.size.height - size.height) * 0.5f), size, }; imageRect = CGRectIntersection(imageRect, drawRect); } else if (mode == PSViewContentModeFillHorizontal) { drawRect = (CGRect) { 0.0f, trunc((drawRect.size.height - size.height) * 0.5f), drawRect.size.width, size.height, }; } else if (mode == PSViewContentModeFillVertical) { drawRect = (CGRect) { trunc((drawRect.size.width - size.width) * 0.5f), 0.0f, size.width, drawRect.size.height, }; } [image drawInRect:drawRect fromRect:imageRect operation:NSCompositeSourceOver fraction:1.0f respectFlipped:YES hints:nil]; } #pragma mark - Public - (void)setBackgroundColor:(NSColor *)aBackgroundColor { backgroundColor = aBackgroundColor; [self setNeedsDisplay:YES]; } - (void)setImage:(NSImage *)anImage { image = anImage; [self setNeedsDisplay:YES]; } - (void)setDrawingBlock:(void (^)(NSView *, NSRect))aDrawingBlock { drawingBlock = [aDrawingBlock copy]; [self setNeedsDisplay:YES]; } #pragma mark - Target/Observer pattern - (void)addTarget:(id)target action:(SEL)action forEvents:(PSViewEvent)events { if (!targets) { NSMutableArray *(^weakArray)(void) = ^{ // Create non-retaining array CFArrayCallBacks callbacks = { 0, NULL, NULL, CFCopyDescription, CFEqual }; return CFBridgingRelease(CFArrayCreateMutable(NULL, 0, &callbacks)); }; targets = @{ @(PSViewEventClick) : weakArray(), @(PSViewEventDoubleClick) : weakArray(), }; selectors = @{ @(PSViewEventClick) : [NSMutableArray array], @(PSViewEventDoubleClick) : [NSMutableArray array], }; } for (NSNumber *eventNumber in targets) { if (!(events & eventNumber.intValue)) continue; NSMutableArray *eventTargets = [targets objectForKey:eventNumber]; NSMutableArray *eventSelectors = [selectors objectForKey:eventNumber]; [eventTargets addObject:target]; [eventSelectors addObject:NSStringFromSelector(action)]; } } - (void)sendActionsForEvents:(PSViewEvent)events { for (NSNumber *eventNumber in targets) { if (!(events & eventNumber.intValue)) continue; NSMutableArray *eventTargets = [targets objectForKey:eventNumber]; NSMutableArray *eventSelectors = [selectors objectForKey:eventNumber]; [eventTargets enumerateObjectsUsingBlock:^(id target, NSUInteger idx, BOOL *stop) { SEL selector = NSSelectorFromString([eventSelectors objectAtIndex:idx]); objc_msgSend(target, selector); }]; } } @end
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 18548 | Robert Cowham | Merge from Main. | ||
#1 | 16507 | perforce_software | Move to main branch. | ||
//guest/perforce_software/piper/mac/R2.0/Perforce/Classes/Views/PSView.m | |||||
#1 | 12962 | alan_petersen |
Populate -o //guest/perforce_software/piper/mac/main/... //guest/perforce_software/piper/mac/R2.0/.... |
||
//guest/perforce_software/piper/mac/main/Perforce/Classes/Views/PSView.m | |||||
#2 | 12961 | alan_petersen |
Piper 2.0 Mega Update New Features/Functionality - Added help menu redirecting to URL. - Added readonly property for creating new workspaces. - Added html hyperlinks for Copy link functionality. - Added functionality for managing Finder Favorite items in sidebar. - Redesigned the way mapping is stored in Piper. - First version of syncing finder sidebar items with workspace mapping. - Small sorting improvements. - Creating Projects directory inside users home folder. - Adding Projects folder to finder sidebar item. - Creating and removing symbolic links accordingly to mapped folders. - Preventing duplicate names in symbolic links. - Refreshing symbolic links on mapping change inside application. - Storing workspace and server details in p4 configuration for other applications to use. - Added contextual menu items for Finder integration. - Added services menu for Adobe Illustrator integration. - Keyboard shortcuts for Illustrator integration. - Code refactoring and fixes for mapping issues. - Added Finder functionality to edit all files in folder. - Added user friendly message when editing a file using Finder outside the workspace. - Implemented hidden automatic login when opening application using Finder integration. - Logging to file in ~/Library/Logs - Unified workspace and all files views to show both local and depot files and folders. - Removed my workspace view references and logic. - Editing unmapped files on server. - First version of adding file to unmapped folders. - Showing opened by and edit actions in column details for all depot files. - Improved mappings functionality. - Enabled same feature options for mapped and unmapped folders and files. - Redesigned from scratch mapping and unmapping procedures for adding and removing files. - Implemented cleaning workspace using new mapping functionality. Removed debug overlay coloring. - Automated workspace creation - Improvements in editing files already mapped to workspace. - Implemented deleting remote files. - Implemented first version of move operation for remote files. - Removing last workspace information when disconnecting from workspace using app menu. - Implemented editing and submitting using symbolic links in project folder. New finder menu service for symbolic links Show in Piper which acts like share link functionality. - New icons for files and folders not tracked in the filesystem. - Improvements in showing file using share link. - Switched to new way of retrieving files in order to show user changes. - Redesigned and implemented new functionality for chaining operations with mapping. - Improvements and redesign of Edit/add actions to use new chaining logic . Fixed issue with file edit. - Improvements in window showing when using services. - Simplified file loading so the local files appears only when remote are also loaded. - Improved deleting of untracked files to avoid mapping and marking for delete. - Enabling simple copy paste and moving of remote and local files. - Added abort for exception handling in order to force crashing application on critical failures - Added custom exception handling for catching runtime errors to log and crash instead of continuing in unstable state. - Changed file copying to use mark for add . - Simplified and fixed responding file representations to mapping changes. Bug Fixes - Fixed crash when synchronizing. - Fixed sync issue when downloading directory without file size information. - Fixed issue with unread list crashing when file is not existing on disk. - Fixed incorrect sync progress calculation. - Removed relative path issues. - Fixed many of case-sensitivity problems. - Fixed deprecated methods and related issues in OS X 10.10. - Fixed folder rename not updating in column view. Revised and fixed many potential problems from implicit casting. - Fixed missing sync button on fast sync completion. - Refreshing mapping on synchronization. Fixed symbolic links not appearing until app is restarted. - Fixed latest crashing of autosync. - Fixed loading indicator issues. - Fixed and redesigned submit dialog to work correctly with Submit All Files option in Finder. - Fixed multiple error messages on network outage. Redesigned showing errors in main window. - Fixed opening random locations when using Finder integration. - Fixed issue when panel was detached from parent window. - Fixed bug when creating new workspace wouldn't store default settings. - Fixed memory issues with network operations. - Fixes in relogging mappings and file listing. - Improvements in editing unmapped files. - Fixed crash when adding file outside workspace. - Fixed breadcrumbs control issue. - Fixed issue with double parent folders when opening unmapped files. - Fixed crashes on sync after mapping new files. - Fixed issue with editing file using Finder -- Merging code and additional fixes in add button functionality. - Fixed unsync not working - Fixed submit panel issue not selecting files with different name case. - Fixed missing revert and sync to workspace actions in some cases. - Fixed issue with Submit and Edit finder actions. Improvements in stability of finder integration. - Fixed issue with unsubmitted folders breaking status of files inside. - Fixed issue with added files not showing correct icon and status. - Fixed bug with file edit resulting in a new directory named exactly like a file. - Fixed issue with reloading of subpath resulting in untracked folders. - Fixed mapping issue when result was always view mapping not relative. - Fixed submit panel showing more than once. - Fixed illustrator services not working. - Fixed userdefaults preferences problem with workspace name being null. - Fixed userdefaults keypath problem of dot-containing workspace names. - Forcing recreating of browser to possibly prevent pre-10.10 errors with automatic workspace selection. - Fixed adding file to depot not presenting correct icon. - Fixed issues with reverting a file that was marked for add. - Presenting error when trying to submit untracked files. - Fixed issue when submit files service crashed when using unmapped files. - Fixed file representation disappearing when removing file. - Fixed issue with symlinks resolving working on 10.10 only. Issue related to workspace selection not showing. - Fixed error panel method calls unavailable in Mac OS versions before 10.10. Issue related to hanging error panels. - Fixed removing a local file resulting in action progress freezing. - Fixed open file not working after edit. - Fixing crash when mapping changed. Issue related to moving local file to unmapped folder and other similar cases. |
||
#1 | 11252 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/mac/Perforce/Classes/Views/PSView.m | |||||
#1 | 10744 | alan_petersen | Rename/move file(s) | ||
//guest/perforce_software/piper/Perforce/Classes/Views/PSView.m | |||||
#1 | 8919 | Matt Attaway | Initial add of Piper, a lightweight Perforce client for artists and designers. |