We now automatically resize and hide the thumbnail panel as appropriate.

Author: btrask

PGBezelPanel.h

@@ -29,6 +29,7 @@ DEALINGS WITH THE SOFTWARE. */
 #import "PGGeometry.h"
 
 extern NSString *const PGBezelPanelFrameShouldChangeNotification;
+extern NSString *const PGBezelPanelFrameDidChangeNotification;
 
 @interface PGBezelPanel : PGFadeOutPanel
 {

PGBezelPanel.m

@@ -29,6 +29,7 @@ copy of this software and associated documentation files (the "Software"),
 #import "NSWindowAdditions.h"
 
 NSString *const PGBezelPanelFrameShouldChangeNotification = @"PGBezelPanelFrameShouldChange";
+NSString *const PGBezelPanelFrameDidChangeNotification    = @"PGBezelPanelFrameDidChange";
 
 @interface PGBezelPanel (Private)
 
@@ -131,6 +132,7 @@ - (void)_updateFrameWithWindow:(NSWindow *)aWindow
 {
 	float const s = [self AE_userSpaceScaleFactor];
 	[self setFrame:[[self contentView] bezelPanel:self frameForContentRect:PGInsetRect([aWindow AE_contentRect], PGScaleInset(_frameInset, 1.0f / s)) scale:s] display:NO];
+	[self AE_postNotificationName:PGBezelPanelFrameDidChangeNotification];
 }
 
 #pragma mark NSStandardKeyBindingMethods Protocol

PGColumnView.h

@@ -37,15 +37,14 @@ DEALINGS WITH THE SOFTWARE. */
 	float           _columnWidth;
 }
 
+- (unsigned)numberOfColumns;
 - (NSArray *)views;
 - (id)lastView;
 - (id)viewAtIndex:(unsigned)index;
 
 - (void)addColumnWithView:(NSView *)aView;
 - (void)insertColumnWithView:(NSView *)aView atIndex:(unsigned)index;
-- (void)removeColumnWithView:(NSView *)aView;
 - (void)removeColumnsAfterView:(NSView *)aView;
-- (void)removeAllColumns;
 
 - (float)columnWidth;
 - (void)setColumnWidth:(float)width;

PGColumnView.m

@@ -31,6 +31,10 @@ @implementation PGColumnView
 
 #pragma mark Instance Methods
 
+- (unsigned)numberOfColumns
+{
+	return [_views count];
+}
 - (NSArray *)views
 {
 	return [[_views copy] autorelease];
@@ -68,22 +72,9 @@ - (void)insertColumnWithView:(NSView *)aView
 	[aView setAutoresizingMask:NSViewWidthSizable];
 	[self scrollToTopOfColumnWithView:aView];
 }
-- (void)removeColumnWithView:(NSView *)aView
-{
-	NSParameterAssert(aView);
-	unsigned const i = [_views indexOfObjectIdenticalTo:aView];
-	NSParameterAssert(NSNotFound != i);
-	(void)[[aView retain] autorelease];
-	PGClipView *const clip = [_clipViews objectAtIndex:i];
-	[clip setDocumentView:nil];
-	[clip removeFromSuperview];
-	[_clipViews removeObjectAtIndex:i];
-	[_views removeObjectAtIndex:i];
-	[self layout];
-}
 - (void)removeColumnsAfterView:(NSView *)aView
 {
-	unsigned const i = [_views indexOfObject:aView];
+	unsigned const i = aView ? [_views indexOfObject:aView] : 0;
 	NSParameterAssert(NSNotFound != i);
 	while([_views count] > i + 1) {
 		PGClipView *const clip = [_clipViews lastObject];
@@ -94,14 +85,6 @@ - (void)removeColumnsAfterView:(NSView *)aView
 	}
 	[self layout];
 }
-- (void)removeAllColumns
-{
-	[_clipViews makeObjectsPerformSelector:@selector(setDocumentView:) withObject:nil];
-	[_clipViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-	[_clipViews removeAllObjects];
-	[_views removeAllObjects];
-	[self layout];
-}
 
 #pragma mark -
 

PGContainerAdapter.m

@@ -161,14 +161,6 @@ - (void)setNode:(PGNode *)aNode
 
 #pragma mark -
 
-- (BOOL)hasViewableNodes
-{
-	if([[self node] isViewable]) return YES;
-	PGNode *child;
-	NSEnumerator *const childEnum = [[self unsortedChildren] objectEnumerator];
-	while((child = [childEnum nextObject])) if([[child resourceAdapter] hasViewableNodes]) return YES;
-	return NO;
-}
 - (BOOL)hasDataNodes
 {
 	if([self canGetData]) return YES;
@@ -185,6 +177,21 @@ - (unsigned)viewableNodeCount
 	while((child = [childEnum nextObject])) count += [[child resourceAdapter] viewableNodeCount];
 	return count;
 }
+- (BOOL)hasViewableNodeCountGreaterThan:(unsigned)anInt
+{
+	unsigned count = [[self node] isViewable] ? 1 : 0;
+	if(count > anInt) return YES;
+	PGNode *child;
+	NSEnumerator *const childEnum = [[self unsortedChildren] objectEnumerator];
+	while((child = [childEnum nextObject])) {
+		PGResourceAdapter *const adapter = [child resourceAdapter];
+		if([adapter hasViewableNodeCountGreaterThan:anInt - count]) return YES;
+		if(![child isViewable]) continue;
+		count++;
+		if(count > anInt) return YES;
+	}
+	return NO;
+}
 
 #pragma mark -
 

PGDisplayController.h

@@ -135,7 +135,10 @@ extern NSString *const PGDisplayControllerTimerDidChangeNotification;
 - (BOOL)tryToLoopForward:(BOOL)forward toNode:(PGNode *)node initialLocation:(PGPageLocation)loc allowAlerts:(BOOL)flag;
 - (void)activateNode:(PGNode *)node;
 
+- (BOOL)canShowInfo;
 - (BOOL)shouldShowInfo;
+- (BOOL)canShowThumbnails;
+- (BOOL)shouldShowThumbnails;
 
 - (BOOL)loadingIndicatorShown;
 - (void)showLoadingIndicator;
@@ -164,6 +167,7 @@ extern NSString *const PGDisplayControllerTimerDidChangeNotification;
 - (void)documentImageScaleDidChange:(NSNotification *)aNotif;
 - (void)documentBaseOrientationDidChange:(NSNotification *)aNotif;
 
+- (void)thumbnailPanelFrameDidChange:(NSNotification *)aNotif;
 - (void)prefControllerBackgroundPatternColorDidChange:(NSNotification *)aNotif;
 
 @end

PGDisplayController.m

@@ -77,7 +77,7 @@ - (void)_readActiveNode;
 - (void)_readFinished;
 - (NSSize)_sizeForImageRep:(NSImageRep *)rep orientation:(PGOrientation)orientation;
 - (void)_updateImageViewSizeAllowAnimation:(BOOL)flag;
-- (void)_updateInfoWithNodeCount;
+- (void)_noteViewableNodeCountDidChange;
 - (void)_updateNodeIndex;
 - (void)_updateInfoPanelText;
 - (void)_runTimer;
@@ -342,7 +342,7 @@ - (BOOL)setActiveDocument:(PGDocument *)document
 	[self setTimerInterval:0];
 	if(_activeDocument) {
 		NSDisableScreenUpdates();
-		if(![_activeDocument showsThumbnails]) [_thumbnailPanel close];
+		if(![self shouldShowThumbnails]) [_thumbnailPanel close];
 		[self documentShowsThumbnailsDidChange:nil];
 		PGNode *node;
 		PGImageView *view;
@@ -432,10 +432,22 @@ - (void)activateNode:(PGNode *)node
 
 #pragma mark -
 
-- (BOOL)shouldShowInfo
+- (BOOL)canShowInfo
 {
 	return YES;
 }
+- (BOOL)shouldShowInfo
+{
+	return [[self activeDocument] showsInfo] && [self canShowInfo];
+}
+- (BOOL)canShowThumbnails
+{
+	return [[[self activeDocument] node] hasViewableNodeCountGreaterThan:1];
+}
+- (BOOL)shouldShowThumbnails
+{
+	return [[self activeDocument] showsThumbnails] && [self canShowThumbnails];
+}
 
 #pragma mark -
 
@@ -553,10 +565,10 @@ - (void)documentWillRemoveNodes:(NSNotification *)aNotif
 }
 - (void)documentSortedNodesDidChange:(NSNotification *)aNotif
 {
-	[self _updateInfoWithNodeCount];
+	[self _noteViewableNodeCountDidChange];
 	if(![self activeNode]) [self setActiveNode:[[[self activeDocument] node] sortedViewableNodeFirst:YES] initialLocation:PGHomeLocation];
 	else [self _updateNodeIndex];
-	if([[self activeDocument] showsThumbnails]) {
+	if([self shouldShowThumbnails]) {
 		[[_thumbnailPanel content] reloadData];
 		[[_thumbnailPanel content] setSelectedItem:[self activeNode]];
 	}
@@ -576,55 +588,32 @@ - (void)documentNodeIsViewableDidChange:(NSNotification *)aNotif
 	} else if([self activeNode] == node) {
 		if(![node isViewable] && ![self tryToGoForward:YES allowAlerts:NO] && ![self tryToGoForward:NO allowAlerts:NO]) [self setActiveNode:[[[self activeDocument] node] sortedViewableNodeFirst:YES] initialLocation:PGHomeLocation];
 	}
-	[self _updateInfoWithNodeCount];
+	[self _noteViewableNodeCountDidChange];
 	[self _updateNodeIndex];
-	if([[self activeDocument] showsThumbnails]) [[_thumbnailPanel content] reloadItem:[node parentNode] reloadChildren:YES];
+	if([self shouldShowThumbnails]) [[_thumbnailPanel content] reloadItem:[node parentNode] reloadChildren:YES];
 }
 - (void)documentNodeThumbnailDidChange:(NSNotification *)aNotif
 {
-	if([[self activeDocument] showsThumbnails]) [[_thumbnailPanel content] reloadItem:[[aNotif userInfo] objectForKey:PGDocumentNodeKey] reloadChildren:NO];
+	if([self shouldShowThumbnails]) [[_thumbnailPanel content] reloadItem:[[aNotif userInfo] objectForKey:PGDocumentNodeKey] reloadChildren:NO];
 }
 
 - (void)documentShowsInfoDidChange:(NSNotification *)aNotif
 {
-	if([[self activeDocument] showsInfo]) [self _updateInfoWithNodeCount];
-	else [_infoPanel fadeOut];
+	if([self shouldShowInfo]) {
+		[[_infoPanel content] setCount:[[[self activeDocument] node] viewableNodeCount]];
+		[_infoPanel displayOverWindow:[self window]];
+	} else [_infoPanel fadeOut];
 }
 - (void)documentShowsThumbnailsDidChange:(NSNotification *)aNotif
 {
-	if([[self activeDocument] showsThumbnails]) {
+	if([self shouldShowThumbnails]) {
 		NSDisableScreenUpdates();
 		[_thumbnailPanel displayOverWindow:[self window]];
 		[[_thumbnailPanel content] reloadData];
 		[[_thumbnailPanel content] setSelectedItem:[self activeNode]];
-		float const panelWidth = NSWidth([_thumbnailPanel frame]);
-		NSWindow *const w = [self window];
-		[w setMinSize:NSMakeSize(PGWindowMinSize + panelWidth, PGWindowMinSize)];
-		NSRect currentFrame = [w frame];
-		if(NSWidth(currentFrame) < PGWindowMinSize + panelWidth) {
-			currentFrame.size.width = PGWindowMinSize + panelWidth;
-			[w setFrame:currentFrame display:YES];
-		}
-		PGInset const inset = PGMakeInset(panelWidth, 0, 0, 0);
-		[clipView setBoundsInset:inset];
-		[_findPanel setFrameInset:inset];
-		[_graphicPanel setFrameInset:inset];
-		[self _updateImageViewSizeAllowAnimation:NO];
-		[self documentReadingDirectionDidChange:nil];
-		[_findPanel updateFrame];
-		[_graphicPanel updateFrame];
 		NSEnableScreenUpdates();
 	} else {
-		[clipView setBoundsInset:PGZeroInset];
-		[_findPanel setFrameInset:PGZeroInset];
-		[_graphicPanel setFrameInset:PGZeroInset];
-		NSDisableScreenUpdates();
-		[self _updateImageViewSizeAllowAnimation:NO];
-		[_findPanel updateFrame];
-		[_graphicPanel updateFrame];
-		[self documentReadingDirectionDidChange:nil];
-		NSEnableScreenUpdates();
-		[[self window] setMinSize:NSMakeSize(PGWindowMinSize, PGWindowMinSize)];
+		[self thumbnailPanelFrameDidChange:nil];
 		[_thumbnailPanel fadeOut];
 	}
 }
@@ -638,7 +627,7 @@ - (void)documentReadingDirectionDidChange:(NSNotification *)aNotif
 		case PGMinXMinYCorner: inset.minY = [self findPanelShown] ? NSHeight([_findPanel frame]) : 0; break;
 		case PGMaxXMinYCorner: inset.minX = [self findPanelShown] ? NSWidth([_findPanel frame]) : 0; break;
 	}
-	if([[self activeDocument] showsThumbnails]) inset.minX += NSWidth([_thumbnailPanel frame]);
+	if([self shouldShowThumbnails]) inset.minX += NSWidth([_thumbnailPanel frame]);
 	[_infoPanel setFrameInset:inset];
 	[[_infoPanel content] setOrigin:corner];
 	[_infoPanel updateFrame];
@@ -654,6 +643,38 @@ - (void)documentBaseOrientationDidChange:(NSNotification *)aNotif
 
 #pragma mark -
 
+- (void)thumbnailPanelFrameDidChange:(NSNotification *)aNotif
+{
+	NSDisableScreenUpdates();
+	if([self shouldShowThumbnails]) {
+		float const panelWidth = NSWidth([_thumbnailPanel frame]);
+		NSWindow *const w = [self window];
+		[w setMinSize:NSMakeSize(PGWindowMinSize + panelWidth, PGWindowMinSize)];
+		NSRect currentFrame = [w frame];
+		if(NSWidth(currentFrame) < PGWindowMinSize + panelWidth) {
+			currentFrame.size.width = PGWindowMinSize + panelWidth;
+			[w setFrame:currentFrame display:YES];
+		}
+		PGInset const inset = PGMakeInset(panelWidth, 0, 0, 0);
+		[clipView setBoundsInset:inset];
+		[_findPanel setFrameInset:inset];
+		[_graphicPanel setFrameInset:inset];
+		[self _updateImageViewSizeAllowAnimation:NO];
+		[self documentReadingDirectionDidChange:nil];
+		[_findPanel updateFrame];
+		[_graphicPanel updateFrame];
+	} else {
+		[clipView setBoundsInset:PGZeroInset];
+		[_findPanel setFrameInset:PGZeroInset];
+		[_graphicPanel setFrameInset:PGZeroInset];
+		[self _updateImageViewSizeAllowAnimation:NO];
+		[_findPanel updateFrame];
+		[_graphicPanel updateFrame];
+		[self documentReadingDirectionDidChange:nil];
+		[[self window] setMinSize:NSMakeSize(PGWindowMinSize, PGWindowMinSize)];
+	}
+	NSEnableScreenUpdates();
+}
 - (void)prefControllerBackgroundPatternColorDidChange:(NSNotification *)aNotif;
 {
 	[clipView setBackgroundColor:[[PGPrefController sharedPrefController] backgroundPatternColor]];
@@ -682,7 +703,7 @@ - (BOOL)_setActiveNode:(PGNode *)aNode
 	_activeNode = [aNode retain];
 	[self _updateNodeIndex];
 	[self _updateInfoPanelText];
-	if([[self activeDocument] showsThumbnails]) [[_thumbnailPanel content] setSelectedItem:aNode];
+	if([self shouldShowThumbnails]) [[_thumbnailPanel content] setSelectedItem:aNode];
 	return YES;
 }
 - (void)_readActiveNode
@@ -742,12 +763,10 @@ - (void)_updateImageViewSizeAllowAnimation:(BOOL)flag
 {
 	[_imageView setSize:[self _sizeForImageRep:[_imageView rep] orientation:[_imageView orientation]] allowAnimation:flag];
 }
-- (void)_updateInfoWithNodeCount
+- (void)_noteViewableNodeCountDidChange
 {
-	if(![self shouldShowInfo]) return [_infoPanel close];
-	unsigned const count = [[[self activeDocument] node] viewableNodeCount];
-	[[_infoPanel content] setCount:count];
-	[_infoPanel displayOverWindow:[self window]];
+	[self documentShowsInfoDidChange:nil];
+	[self documentShowsThumbnailsDidChange:nil];
 }
 - (void)_updateNodeIndex
 {
@@ -820,9 +839,12 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem
 		case NSFindPanelActionPrevious: break;
 		default: return NO;
 	}
-	if(![self shouldShowInfo]) {
+	if(![self canShowInfo]) {
 		if(@selector(toggleInfo:) == action) return NO;
 	}
+	if(![self canShowThumbnails]) {
+		if(@selector(toggleThumbnails:) == action) return NO;
+	}
 	if([[self activeDocument] baseOrientation] == PGUpright) {
 		if(@selector(revertOrientation:) == action) return NO;
 	}
@@ -832,7 +854,7 @@ - (BOOL)validateMenuItem:(NSMenuItem *)anItem
 		if(@selector(zoomOut:) == action && [_imageView averageScaleFactor] <= PGScaleMin) return NO;
 	}
 	PGNode *const firstNode = [[[self activeDocument] node] sortedViewableNodeFirst:YES];
-	if(!firstNode) { // We could use -hasViewableNodes, but we might have to get -firstNode anyway.
+	if(!firstNode) { // We might have to get -firstNode anyway.
 		if(@selector(firstPage:) == action) return NO;
 		if(@selector(previousPage:) == action) return NO;
 		if(@selector(nextPage:) == action) return NO;
@@ -1077,7 +1099,7 @@ - (NSImage *)thumbnailView:(PGThumbnailView *)sender
 - (BOOL)thumbnailView:(PGThumbnailView *)sender
         canSelectItem:(id)item;
 {
-	return [item hasViewableNodes];
+	return [item hasViewableNodeCountGreaterThan:0];
 }
 
 #pragma mark NSServicesRequests Protocol
@@ -1220,6 +1242,7 @@ - (id)init
 		[_thumbnailPanel setDelegate:self];
 		[[_thumbnailPanel content] setDataSource:self];
 		[[_thumbnailPanel content] setDelegate:self];
+		[_thumbnailPanel AE_addObserver:self selector:@selector(thumbnailPanelFrameDidChange:) name:PGBezelPanelFrameDidChangeNotification];
 
 		[[PGPrefController sharedPrefController] AE_addObserver:self selector:@selector(prefControllerBackgroundPatternColorDidChange:) name:PGPrefControllerBackgroundPatternColorDidChangeNotification];
 	}