Commits

Anonymous committed 67f8752

Split View - Fixed issue where pane wouldn't uncollapse after manual collapse (thanks Sean Patrick O'Brien)

Comments (0)

Files changed (1)

 	if ([self hasCollapsibleDivider] == NO)
 		collapsibleDividerThickness = 0;
 	
+	// Collapsing by dragging the divider sets the view to be hidden, so unhide it
+	[[self collapsibleSubview] setHidden:NO];
 	
 	if ([self isVertical])
 	{
 		if (([self collapsiblePopupSelection] == 1 && subviewIndex == 0 && dividerIndex == 0) ||
 			([self collapsiblePopupSelection] == 2 && subviewIndex == [[self subviews] count] - 1 && dividerIndex == [[splitView subviews] count] - 2))
 		{
+			if ([self isVertical])
+				uncollapsedSize = [self collapsibleSubview].frame.size.width;
+			else
+				uncollapsedSize = [self collapsibleSubview].frame.size.height;
+			
 			[self setCollapsibleSubviewCollapsed:YES];
 			
 			// Cause the collapse ourselves by calling the resize method
 
 - (void)splitViewDidResizeSubviews:(NSNotification *)aNotification
 {
+	CGFloat collapsibleViewSize = [self isVertical] ?  [self collapsibleSubview].frame.size.width : [self collapsibleSubview].frame.size.height;
+	if (!isAnimating && collapsibleViewSize > 0) 
+	{
+		uncollapsedSize = collapsibleViewSize;
+	}
+
 	if (collapsibleSubviewCollapsed && ([self isVertical] ? [[self collapsibleSubview] frame].size.width > 0 : [[self collapsibleSubview] frame].size.height > 0))
 	{
 		[self setCollapsibleSubviewCollapsed:NO];
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.