From: Eric Kuck <eric@bluelinelabs.com>
Date: Thu, 13 Dec 2018 03:16:28 +0000 (-0600)
Subject: Fixed hacky logo display for settings
X-Git-Tag: 0.0.20181104-6~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eec53d6d3d5290b431737f5899a53b66118bfd3;p=thirdparty%2Fwireguard-apple.git

Fixed hacky logo display for settings

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
---

diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
index 8f248c9..346f66d 100644
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
@@ -43,10 +43,16 @@ class SettingsTableViewController: UITableViewController {
         self.tableView.register(KeyValueCell.self)
         self.tableView.register(ButtonCell.self)
 
-        let logo = UIImageView(image: UIImage(named: "wireguard.pdf", in: Bundle.main, compatibleWith: nil)!)
+        let image = UIImage(named: "wireguard.pdf")!
+        let logo = UIImageView(image: image)
         logo.contentMode = .scaleAspectFit
-        let height = self.tableView.rowHeight * 1.5
-        let width = height * logo.image!.size.width / logo.image!.size.height
+        var height = self.tableView.estimatedRowHeight * 1.5
+        var width = height * image.size.width / image.size.height
+        let minScreenDimension = min(UIScreen.main.bounds.size.width, UIScreen.main.bounds.size.height)
+        if width > minScreenDimension - 30 {
+            width = minScreenDimension - 30
+            height = width * image.size.height / image.size.width
+        }
         logo.frame = CGRect(x: 0, y: 0, width: width, height: height)
         logo.bounds = logo.frame.insetBy(dx: 2, dy: 2)
         self.tableView.tableFooterView = logo