diff --git a/clients/ios/Classes/FontListViewController.m b/clients/ios/Classes/FontListViewController.m index 54d64dab8..6e4a939bd 100644 --- a/clients/ios/Classes/FontListViewController.m +++ b/clients/ios/Classes/FontListViewController.m @@ -24,14 +24,25 @@ self.fontTableView.backgroundColor = UIColorFromRGB(0xECEEEA); self.fontTableView.separatorColor = UIColorFromRGB(0x909090); + + // eliminate extra separators at bottom of menu, if any + self.fontTableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectZero]; } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; self.title = @"Font"; +} + +- (void)viewDidAppear:(BOOL)animated { + [super viewDidAppear:animated]; + + CGSize contentSize = self.fontTableView.contentSize; + contentSize.height += self.fontTableView.frame.origin.y * 2; - self.preferredContentSize = CGSizeMake(240.0, 38.0 * self.fonts.count); + self.navigationController.preferredContentSize = contentSize; + self.fontTableView.scrollEnabled = contentSize.height > self.view.frame.size.height; } #pragma mark - Table view data source diff --git a/clients/ios/Classes/FontSettingsViewController.m b/clients/ios/Classes/FontSettingsViewController.m index dc27a2e05..f2f08ec60 100644 --- a/clients/ios/Classes/FontSettingsViewController.m +++ b/clients/ios/Classes/FontSettingsViewController.m @@ -108,7 +108,9 @@ [self.menuTableView reloadData]; - self.preferredContentSize = CGSizeMake(240.0, 296.0); + // -[NewsBlurAppDelegate navigationController:willShowViewController:animated:] hides this too late, so this gets mis-measured otherwise + self.navigationController.navigationBarHidden = YES; + self.navigationController.preferredContentSize = CGSizeMake(240.0, self.menuTableView.contentSize.height + (self.menuTableView.frame.origin.y * 2)); } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {