From 36aa41568caf5864435a4f00444bacc019e4a7b7 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Sat, 10 Sep 2022 21:43:26 +0200
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fix=20issue=20with=20minimum?=
 =?UTF-8?q?=20width=20w/=20hidden=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpmon/Domain/Menu/StatusMenu+Items.swift   |  5 +++--
 phpmon/Domain/SwiftUI/Menu/HeaderView.swift | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/phpmon/Domain/Menu/StatusMenu+Items.swift b/phpmon/Domain/Menu/StatusMenu+Items.swift
index 2de18f1..07a28d7 100644
--- a/phpmon/Domain/Menu/StatusMenu+Items.swift
+++ b/phpmon/Domain/Menu/StatusMenu+Items.swift
@@ -19,8 +19,9 @@ extension StatusMenu {
         }
 
         addItem(HeaderView.asMenuItem(
-            text: "\("mi_php_version".localized) \(PhpEnv.phpInstall.version.long)")
-        )
+            text: "\("mi_php_version".localized) \(PhpEnv.phpInstall.version.long)",
+            minimumWidth: 280 // this ensures the menu is at least wide enough not to cause clipping
+        ))
     }
 
     func addPhpActionMenuItems() {
diff --git a/phpmon/Domain/SwiftUI/Menu/HeaderView.swift b/phpmon/Domain/SwiftUI/Menu/HeaderView.swift
index 430ed33..b61f08f 100644
--- a/phpmon/Domain/SwiftUI/Menu/HeaderView.swift
+++ b/phpmon/Domain/SwiftUI/Menu/HeaderView.swift
@@ -26,11 +26,17 @@ struct HeaderView: View {
 
     static func asMenuItem(
         text: String,
-        width: Int? = nil
+        minimumWidth: CGFloat? = nil
     ) -> NSMenuItem {
         let view = NSHostingView(rootView: Self(text: text))
         view.autoresizingMask = [.width, .height]
-        view.setFrameSize(CGSize(width: view.frame.width, height: 24))
+
+        var finalWidth = view.frame.width
+        if minimumWidth != nil && minimumWidth! > finalWidth {
+            finalWidth = minimumWidth!
+        }
+
+        view.setFrameSize(CGSize(width: finalWidth, height: 24))
 
         let item = NSMenuItem()
         item.view = view

From 42b79d3cb333fa4c61e44e09e08fdde46d5c6218 Mon Sep 17 00:00:00 2001
From: Nico Verbruggen <mail@nicoverbruggen.be>
Date: Sat, 10 Sep 2022 21:44:17 +0200
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A7=20Upgrade=20to=20Xcode=2014?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PHP Monitor.xcodeproj/project.pbxproj                     | 8 +++++++-
 .../xcshareddata/xcschemes/PHP Monitor.xcscheme           | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj
index e9e7926..4afe147 100644
--- a/PHP Monitor.xcodeproj/project.pbxproj	
+++ b/PHP Monitor.xcodeproj/project.pbxproj	
@@ -1206,7 +1206,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1320;
-				LastUpgradeCheck = 1320;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "Nico Verbruggen";
 				TargetAttributes = {
 					C41C1B3222B0097F00E7CF16 = {
@@ -1648,6 +1648,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1710,6 +1711,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1740,6 +1742,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 965;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1767,6 +1770,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 965;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG = NO;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1789,6 +1793,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = "phpmon-tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1808,6 +1813,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8M54J5J787;
 				INFOPLIST_FILE = "phpmon-tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme
index 730932a..1a553ad 100644
--- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme	
+++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1320"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"