From 7b1db2614fdf562671f65a70dfa2b820c8d22aa0 Mon Sep 17 00:00:00 2001 From: Riley Testut Date: Tue, 31 May 2022 18:03:26 -0700 Subject: [PATCH] =?UTF-8?q?Fixes=20ControllerInputsViewController=E2=80=99?= =?UTF-8?q?s=20system=20picker=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Delta/Components/Popover Menu/ListMenuViewController.swift | 3 ++- .../Settings/Controllers/ControllerInputsViewController.swift | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Delta/Components/Popover Menu/ListMenuViewController.swift b/Delta/Components/Popover Menu/ListMenuViewController.swift index 6129d47..4337d51 100644 --- a/Delta/Components/Popover Menu/ListMenuViewController.swift +++ b/Delta/Components/Popover Menu/ListMenuViewController.swift @@ -21,7 +21,8 @@ class ListMenuViewController: UITableViewController override var preferredContentSize: CGSize { get { - let navigationBarHeight = self.navigationController?.navigationBar.bounds.height ?? 0.0 + // Don't include navigation bar height in calculation (as of iOS 13). + let navigationBarHeight = 0.0 // self.navigationController?.navigationBar.bounds.height ?? 0.0 return CGSize(width: 0, height: (self.tableView.rowHeight * CGFloat(self.items.count)) + navigationBarHeight) } set {} diff --git a/Delta/Settings/Controllers/ControllerInputsViewController.swift b/Delta/Settings/Controllers/ControllerInputsViewController.swift index 2051891..964c034 100644 --- a/Delta/Settings/Controllers/ControllerInputsViewController.swift +++ b/Delta/Settings/Controllers/ControllerInputsViewController.swift @@ -210,6 +210,10 @@ private extension ControllerInputsViewController listMenuViewController.title = NSLocalizedString("Game System", comment: "") let navigationController = UINavigationController(rootViewController: listMenuViewController) + if #available(iOS 13, *) + { + navigationController.navigationBar.scrollEdgeAppearance = navigationController.navigationBar.standardAppearance + } let popoverMenuController = PopoverMenuController(popoverViewController: navigationController) self.navigationItem.popoverMenuController = popoverMenuController