From d3b1afe9fd16a3a51e8f03382907ed3e4a5cf985 Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Thu, 19 Jan 2023 17:50:13 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bug=20related=20to=20"=3F"?= =?UTF-8?q?=20not=20showing=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 8 ++++---- phpmon/Domain/SwiftUI/Common/HelpButton.swift | 11 ++++++++++- phpmon/Domain/SwiftUI/Menu/ServicesView.swift | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 02fec9c..99832e6 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -2799,7 +2799,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1026; + CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; @@ -2828,7 +2828,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1026; + CURRENT_PROJECT_VERSION = 1027; DEAD_CODE_STRIPPING = YES; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; @@ -3056,7 +3056,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1026; + CURRENT_PROJECT_VERSION = 1027; DEBUG = NO; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; @@ -3166,7 +3166,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1026; + CURRENT_PROJECT_VERSION = 1027; DEBUG = YES; DEVELOPMENT_TEAM = 8M54J5J787; ENABLE_HARDENED_RUNTIME = YES; diff --git a/phpmon/Domain/SwiftUI/Common/HelpButton.swift b/phpmon/Domain/SwiftUI/Common/HelpButton.swift index 8fea3d0..5c9dc85 100644 --- a/phpmon/Domain/SwiftUI/Common/HelpButton.swift +++ b/phpmon/Domain/SwiftUI/Common/HelpButton.swift @@ -14,8 +14,17 @@ struct HelpButton: View { var body: some View { Button(action: action, label: { - Text("?").font(.system(size: 12, weight: .medium)) + ZStack { + Circle() + .strokeBorder(Color(NSColor.separatorColor), lineWidth: 0.5) + .background(Circle().foregroundColor(Color(NSColor.controlColor)).opacity(0.7)) + .shadow(color: Color(NSColor.separatorColor).opacity(0.3), radius: 1) + .frame(width: 14, height: 14) + Text("?").font(.system(size: 12, weight: .medium)) + .foregroundColor(Color(NSColor.labelColor)) + } }) + .buttonStyle(BorderlessButtonStyle()) .focusable(false) } diff --git a/phpmon/Domain/SwiftUI/Menu/ServicesView.swift b/phpmon/Domain/SwiftUI/Menu/ServicesView.swift index 8f71fc6..b9fcd13 100644 --- a/phpmon/Domain/SwiftUI/Menu/ServicesView.swift +++ b/phpmon/Domain/SwiftUI/Menu/ServicesView.swift @@ -74,7 +74,7 @@ struct ServicesView: View { .foregroundColor(self.manager.statusColor) Text(self.manager.statusMessage) .font(.system(size: 11)) - if self.manager.statusColor == .red { + if self.manager.statusColor == Color("StatusColorRed") { HelpButton { let type = manager.hasError ? "key_service_has_error"