From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Thu, 13 Dec 2018 04:15:50 +0000 (+0100)
Subject: Settings: better padding calculation
X-Git-Tag: 0.0.20181104-6~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecbab37e0e7ef62c01d239211d08214e8d4a509f;p=thirdparty%2Fwireguard-apple.git

Settings: better padding calculation

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
index 346f66d..fe276b1 100644
--- a/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
+++ b/WireGuard/WireGuard/UI/iOS/SettingsTableViewController.swift
@@ -48,9 +48,9 @@ class SettingsTableViewController: UITableViewController {
         logo.contentMode = .scaleAspectFit
         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
+        let minScreenDimension = min(UIScreen.main.bounds.size.width, UIScreen.main.bounds.size.height) - max(self.tableView.layoutMargins.right, CGFloat(10))
+        if width > minScreenDimension {
+            width = minScreenDimension
             height = width * image.size.height / image.size.width
         }
         logo.frame = CGRect(x: 0, y: 0, width: width, height: height)