Merge pull request #88 from ksuther/split-view

Split view modernization, better window frame restoration and other fixes

Author: tiennou

Classes/Controllers/PBGitCommitController.m

@@ -11,14 +11,13 @@
 #import "PBChangedFile.h"
 #import "PBWebChangesController.h"
 #import "PBGitIndex.h"
-#import "PBNiceSplitView.h"
 #import "PBGitRepositoryWatcher.h"
 #import "PBCommitMessageView.h"
+#import "NSSplitView+GitX.h"
 
 #import <ObjectiveGit/GTRepository.h>
 #import <ObjectiveGit/GTConfiguration.h>
 
-#define kCommitSplitViewPositionDefault @"Commit SplitView Position"
 #define kMinimalCommitMessageLength 3
 #define kNotificationDictionaryDescriptionKey @"description"
 #define kNotificationDictionaryMessageKey @"message"
@@ -36,7 +35,7 @@ @interface PBGitCommitController () <NSTextViewDelegate, NSMenuDelegate> {
 	IBOutlet NSButton *commitButton;
 
 	IBOutlet PBWebChangesController *webController;
-	IBOutlet PBNiceSplitView *commitSplitView;
+	IBOutlet NSSplitView *commitSplitView;
 }
 
 @property (weak) IBOutlet NSTableView *unstagedTable;
@@ -70,6 +69,8 @@ - (id)initWithRepository:(PBGitRepository *)theRepository superController:(PBGit
 
 - (void)awakeFromNib
 {
+	[commitSplitView pb_restoreAutosavedPositions];
+
 	[super awakeFromNib];
 
 	commitMessageView.repository = self.repository;
@@ -93,9 +94,6 @@ - (void)awakeFromNib
 	[stagedFilesController setAutomaticallyRearrangesObjects:NO];
 	[unstagedFilesController setAutomaticallyRearrangesObjects:NO];
 
-	[commitSplitView setHidden:YES];
-	[self performSelector:@selector(restoreCommitSplitViewPositiion) withObject:nil afterDelay:0];
-
 	[unstagedTable setDoubleAction:@selector(didDoubleClickOnTable:)];
 	[stagedTable setDoubleAction:@selector(didDoubleClickOnTable:)];
 
@@ -125,7 +123,6 @@ - (void) updateView
 
 - (void)closeView
 {
-	[self saveCommitSplitViewPosition];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 	[webController closeView];
 }
@@ -460,81 +457,6 @@ - (void)indexOperationFailed:(NSNotification *)notification
 										 infoText:notification.userInfo[kNotificationDictionaryDescriptionKey]];
 }
 
-
-#pragma mark NSSplitView delegate methods
-
-#define kCommitSplitViewTopViewMin 150
-#define kCommitSplitViewBottomViewMin 100
-
-- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex
-{
-	if (splitView == commitSplitView)
-		return kCommitSplitViewTopViewMin;
-
-	return proposedMin;
-}
-
-- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex
-{
-	if (splitView == commitSplitView)
-		return splitView.frame.size.height - splitView.dividerThickness - kCommitSplitViewBottomViewMin;
-
-	return proposedMax;
-}
-
-// while the user resizes the window keep the lower (changes/message) view constant and just resize the upper view
-// unless the upper view gets too small
-- (void)resizeCommitSplitView
-{
-	NSRect newFrame = [commitSplitView frame];
-
-	CGFloat dividerThickness = commitSplitView.dividerThickness;
-
-	NSView *upperView = [[commitSplitView subviews] objectAtIndex:0];
-	NSRect upperFrame = [upperView frame];
-	upperFrame.size.width = newFrame.size.width;
-
-	NSView *lowerView = [[commitSplitView subviews] objectAtIndex:1];
-	NSRect lowerFrame = [lowerView frame];
-	lowerFrame.size.width = newFrame.size.width;
-
-	upperFrame.size.height = newFrame.size.height - lowerFrame.size.height - dividerThickness;
-	if (upperFrame.size.height < kCommitSplitViewTopViewMin)
-		upperFrame.size.height = kCommitSplitViewTopViewMin;
-
-	lowerFrame.size.height = newFrame.size.height - upperFrame.size.height - dividerThickness;
-	lowerFrame.origin.y = newFrame.size.height - lowerFrame.size.height;
-
-	[upperView setFrame:upperFrame];
-	[lowerView setFrame:lowerFrame];
-}
-
-- (void)splitView:(NSSplitView *)splitView resizeSubviewsWithOldSize:(NSSize)oldSize
-{
-	if (splitView == commitSplitView)
-		[self resizeCommitSplitView];
-}
-
-// NSSplitView does not save and restore the position of the splitView correctly so do it manually
-- (void)saveCommitSplitViewPosition
-{
-	CGFloat position = [[[commitSplitView subviews] objectAtIndex:0] frame].size.height;
-	[[NSUserDefaults standardUserDefaults] setDouble:position forKey:kCommitSplitViewPositionDefault];
-	[[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-// make sure this happens after awakeFromNib
-- (void)restoreCommitSplitViewPositiion
-{
-	CGFloat position = [[NSUserDefaults standardUserDefaults] doubleForKey:kCommitSplitViewPositionDefault];
-	if (position < 1.0)
-		position = commitSplitView.frame.size.height - 225;
-
-	[commitSplitView setPosition:position ofDividerAtIndex:0];
-	[commitSplitView setHidden:NO];
-}
-
-
 #pragma mark NSTextView delegate methods
 
 - (void)focusTable:(NSTableView *)table

Classes/Controllers/PBGitHistoryController.h

@@ -11,7 +11,6 @@
 
 @class PBGitCommit;
 @class PBGitTree;
-@class PBCollapsibleSplitView;
 
 @class PBGitSidebarController;
 @class PBWebHistoryController;
@@ -33,7 +32,7 @@
 	__weak IBOutlet NSSearchField *searchField;
 	__weak IBOutlet NSOutlineView *fileBrowser;
 	__weak IBOutlet PBCommitList *commitList;
-	__weak IBOutlet PBCollapsibleSplitView *historySplitView;
+	__weak IBOutlet NSSplitView *historySplitView;
 	__weak IBOutlet PBGitGradientBarView *upperToolbarView;
 	__weak IBOutlet PBGitGradientBarView *scopeBarView;
 	__weak IBOutlet NSButton *allBranchesFilterItem;
@@ -94,9 +93,4 @@
 
 - (NSMenu *)tableColumnMenu;
 
-- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview;
-- (BOOL)splitView:(NSSplitView *)splitView shouldCollapseSubview:(NSView *)subview forDoubleClickOnDividerAtIndex:(NSInteger)dividerIndex;
-- (CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset;
-- (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset;
-
 @end

Classes/Controllers/PBGitHistoryController.m

@@ -11,7 +11,6 @@
 #import "PBGitRef.h"
 #import "PBGitHistoryList.h"
 #import "PBGitRevSpecifier.h"
-#import "PBCollapsibleSplitView.h"
 #import "PBGitHistoryController.h"
 #import "PBWebHistoryController.h"
 #import "PBGitGrapher.h"
@@ -30,21 +29,19 @@
 #import "PBQLTextView.h"
 #import "GLFileView.h"
 #import "GitXCommitCopier.h"
+#import "NSSplitView+GitX.h"
 #import <Quartz/Quartz.h>
 
 
 #define kHistorySelectedDetailIndexKey @"PBHistorySelectedDetailIndex"
 #define kHistoryDetailViewIndex 0
 #define kHistoryTreeViewIndex 1
 
-#define kHistorySplitViewPositionDefault @"History SplitView Position"
-
 @interface PBGitHistoryController ()
 
 - (void) updateBranchFilterMatrix;
 - (void) restoreFileBrowserSelection;
 - (void) saveFileBrowserSelection;
-- (void)saveSplitViewPosition;
 
 @end
 
@@ -58,6 +55,8 @@ @implementation PBGitHistoryController
 
 - (void)awakeFromNib
 {
+	[historySplitView pb_restoreAutosavedPositions];
+
 	self.selectedCommitDetailsIndex = [[NSUserDefaults standardUserDefaults] integerForKey:kHistorySelectedDetailIndexKey];
 
 	[commitController addObserver:self forKeyPath:@"selection" options:0 context:@"commitChange"];
@@ -95,10 +94,6 @@ - (void)awakeFromNib
 	// Add a menu that allows a user to select which columns to view
 	[[commitList headerView] setMenu:[self tableColumnMenu]];
 
-	[historySplitView setTopMin:58.0 andBottomMin:100.0];
-	[historySplitView setHidden:YES];
-	[self performSelector:@selector(restoreSplitViewPositiion) withObject:nil afterDelay:0];
-
 	[upperToolbarView setTopShade:237/255.0f bottomShade:216/255.0f];
 	[scopeBarView setTopColor:[NSColor colorWithCalibratedHue:0.579 saturation:0.068 brightness:0.898 alpha:1.000] 
 				  bottomColor:[NSColor colorWithCalibratedHue:0.579 saturation:0.119 brightness:0.765 alpha:1.000]];
@@ -438,7 +433,7 @@ - (IBAction) toggleQLPreviewPanel:(id)sender
 
 - (void) updateQuicklookForce:(BOOL)force
 {
-	if (!force && ![[QLPreviewPanel sharedPreviewPanel] isVisible])
+	if (!force && (![QLPreviewPanel sharedPreviewPanelExists] || ![[QLPreviewPanel sharedPreviewPanel] isVisible]))
 		return;
 
 	[[QLPreviewPanel sharedPreviewPanel] reloadData];
@@ -517,8 +512,6 @@ - (BOOL) hasNonlinearPath
 
 - (void)closeView
 {
-	[self saveSplitViewPosition];
-
 	if (commitController) {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 		[commitController removeObserver:self forKeyPath:@"selection"];
@@ -637,55 +630,6 @@ - (NSArray *)menuItemsForPaths:(NSArray *)paths
 	return menuItems;
 }
 
-
-#pragma mark NSSplitView delegate methods
-
-- (BOOL)splitView:(NSSplitView *)splitView canCollapseSubview:(NSView *)subview
-{
-	return TRUE;
-}
-
-- (BOOL)splitView:(NSSplitView *)splitView shouldCollapseSubview:(NSView *)subview forDoubleClickOnDividerAtIndex:(NSInteger)dividerIndex
-{
-	NSUInteger index = [[splitView subviews] indexOfObject:subview];
-	// this method (and canCollapse) are called by the splitView to decide how to collapse on double-click
-	// we compare our two subviews, so that always the smaller one is collapsed.
-	if([[[splitView subviews] objectAtIndex:index] frame].size.height < [[[splitView subviews] objectAtIndex:((index+1)%2)] frame].size.height) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex
-{
-	return historySplitView.topViewMin;
-}
-
-- (CGFloat)splitView:(NSSplitView *)splitView constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex
-{
-	return [splitView frame].size.height - [splitView dividerThickness] - historySplitView.bottomViewMin;
-}
-
-// NSSplitView does not save and restore the position of the SplitView correctly so do it manually
-- (void)saveSplitViewPosition
-{
-	CGFloat position = [[historySplitView subviews] objectAtIndex:0].frame.size.height;
-	[[NSUserDefaults standardUserDefaults] setDouble:position forKey:kHistorySplitViewPositionDefault];
-	[[NSUserDefaults standardUserDefaults] synchronize];
-}
-
-// make sure this happens after awakeFromNib
-- (void)restoreSplitViewPositiion
-{
-	CGFloat position = [[NSUserDefaults standardUserDefaults] doubleForKey:kHistorySplitViewPositionDefault];
-	if (position < 1.0)
-		position = 175;
-
-	[historySplitView setPosition:position ofDividerAtIndex:0];
-	[historySplitView setHidden:NO];
-}
-
-
 #pragma mark Repository Methods
 
 - (IBAction) createBranch:(id)sender

Classes/Controllers/PBGitWindowController.m

@@ -46,8 +46,10 @@ - (void)synchronizeWindowTitleWithDocumentName
 {
     [super synchronizeWindowTitleWithDocumentName];
 
-    // Point window proxy icon at project directory, not internal .git dir
-    [[self window] setRepresentedURL:self.repository.workingDirectoryURL];
+	if ([self isWindowLoaded]) {
+		// Point window proxy icon at project directory, not internal .git dir
+		[[self window] setRepresentedURL:self.repository.workingDirectoryURL];
+	}
 }
 
 - (void)windowWillClose:(NSNotification *)notification
@@ -99,11 +101,14 @@ - (BOOL) validateMenuItem:(NSMenuItem *)menuItem remoteTitle:(NSString *)localis
 }
 
 
-- (void) awakeFromNib
+- (void) windowDidLoad
 {
-	[[self window] setDelegate:self];
-	[[self window] setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
-	[[self window] setContentBorderThickness:31.0f forEdge:NSMinYEdge];
+	[super windowDidLoad];
+
+	// Explicitly set the frame using the autosave name
+	// Opening the first and second documents works fine, but the third and subsequent windows aren't positioned correctly
+	[[self window] setFrameUsingName:@"GitX"];
+	[[self window] setRepresentedURL:self.repository.workingDirectoryURL];
 
 	sidebarController = [[PBGitSidebarController alloc] initWithRepository:repository superController:self];
 	[[sidebarController view] setFrame:[sourceSplitView bounds]];
@@ -112,8 +117,6 @@ - (void) awakeFromNib
 
 	[[statusField cell] setBackgroundStyle:NSBackgroundStyleRaised];
 	[progressIndicator setUsesThreadedAnimation:YES];
-
-	[self showWindow:nil];
 }
 
 - (void) removeAllContentSubViews
@@ -398,50 +401,4 @@ - (IBAction) refresh:(id)sender
 	[contentController refresh:self];
 }
 
-#pragma mark -
-#pragma mark SplitView Delegates
-
-#define kGitSplitViewMinWidth 150.0f
-#define kGitSplitViewMaxWidth 300.0f
-
-#pragma mark min/max widths while moving the divider
-
-- (CGFloat)splitView:(NSSplitView *)view constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)dividerIndex
-{
-	if (proposedMin < kGitSplitViewMinWidth)
-		return kGitSplitViewMinWidth;
-
-	return proposedMin;
-}
-
-- (CGFloat)splitView:(NSSplitView *)view constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)dividerIndex
-{
-	if (dividerIndex == 0)
-		return kGitSplitViewMaxWidth;
-
-	return proposedMax;
-}
-
-#pragma mark constrain sidebar width while resizing the window
-
-- (void)splitView:(NSSplitView *)sender resizeSubviewsWithOldSize:(NSSize)oldSize
-{
-	NSRect newFrame = [sender frame];
-
-	CGFloat dividerThickness = [sender dividerThickness];
-
-	NSView *sourceView = [[sender subviews] objectAtIndex:0];
-	NSRect sourceFrame = [sourceView frame];
-	sourceFrame.size.height = newFrame.size.height;
-
-	NSView *mainView = [[sender subviews] objectAtIndex:1];
-	NSRect mainFrame = [mainView frame];
-	mainFrame.origin.x = sourceFrame.size.width + dividerThickness;
-	mainFrame.size.width = newFrame.size.width - mainFrame.origin.x;
-	mainFrame.size.height = newFrame.size.height;
-
-	[sourceView setFrame:sourceFrame];
-	[mainView setFrame:mainFrame];
-}
-
 @end

Classes/NSSplitView+GitX.h

@@ -0,0 +1,15 @@
+//
+//  NSSplitView+GitX.h
+//  GitX
+//
+//  Created by Kent Sutherland on 4/25/17.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSSplitView (GitX)
+
+- (void)pb_restoreAutosavedPositions;
+
+@end