Fixes bottom bar hidden in QLPreviewController

steventroughtonsmith · Jun 12, 2016 · f053666 · f053666
1 parent 97beff5
commit f053666
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Files/FBColumnNavigationController.m b/Files/FBColumnNavigationController.m
@@ -42,4 +42,5 @@ -(void)_performPop:(id)sender
 	[self.columnViewController popToViewController:self];
 }
 
+
 @end
diff --git a/Files/FBColumnViewController.m b/Files/FBColumnViewController.m
@@ -67,13 +67,12 @@ -(void)pushViewController:(UIViewController <FBColumnViewControllerChild>*)vc
 	if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
 	{
 		[self.rootNavigationController pushViewController:vc.childViewControllers.firstObject animated:YES];
+		[self.rootNavigationController setToolbarHidden:NO];
 	}
 	else
 	{
 		[self layout];
 
-
-
 		self.view.contentSize = CGSizeMake(self.viewControllers.lastObject.view.frame.origin.x+self.viewControllers.lastObject.view.frame.size.width, self.view.frame.size.height-44-_FBStatusBarDelta());
 		[self.view scrollRectToVisible:vc.view.frame animated:YES];
 	}

diff --git a/Files/FBFilesTableViewController.m b/Files/FBFilesTableViewController.m
@@ -365,7 +365,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 					[self.columnViewController popToViewController:self.parentViewController];
 
 					FBCustomPreviewController *preview = [[FBCustomPreviewController alloc] initWithFile:newPath];
-					
+
 					FBColumnNavigationController *detailNavController = [[FBColumnNavigationController alloc] initWithRootViewController:preview];
 
 					[self.columnViewController pushDetailViewController:detailNavController];
@@ -376,10 +376,10 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 
 					FBQLPreviewController *preview = [[FBQLPreviewController alloc] init];
 					preview.dataSource = self;
-					
+
 					FBColumnNavigationController *detailNavController = [[FBColumnNavigationController alloc] initWithRootViewController:preview];
-
 					[self.columnViewController pushDetailViewController:detailNavController];
+
 				}
 			}
 		}

diff --git a/Files/FBQLPreviewController.m b/Files/FBQLPreviewController.m
@@ -15,4 +15,9 @@ -(BOOL)canBecomeFirstResponder
 	return NO; // Don't let QLPreviewController interfere with keyboard shortcuts
 }
 
+-(void)viewWillAppear:(BOOL)animated
+{
+	[super viewWillAppear:animated];
+	[self.navigationController setToolbarHidden:NO];
+}
 @end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,5 @@ -(void)_performPop:(id)sender
		[self.columnViewController popToViewController:self];
		}


		@end