From 206f0e72638e7229e9c0daeb15e22c447ec9cbbf Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 10 Jul 2020 15:21:47 -0500 Subject: [PATCH] Add SWIFTUI compiler directive --- Shared/Article Rendering/ArticleRenderer.swift | 4 ++-- xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig | 1 + xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Shared/Article Rendering/ArticleRenderer.swift b/Shared/Article Rendering/ArticleRenderer.swift index 39cf38b5d..9cce8f8b4 100644 --- a/Shared/Article Rendering/ArticleRenderer.swift +++ b/Shared/Article Rendering/ArticleRenderer.swift @@ -266,10 +266,10 @@ private extension ArticleRenderer { func styleSubstitutions() -> [String: String] { var d = [String: String]() - if #available(macOS 10.16, *) { + #if SWIFTUI let bodyFont = NSFont.preferredFont(forTextStyle: .body) d["font-size"] = String(describing: Int(round(bodyFont.pointSize * 1.33))) - } + #endif guard let linkColor = NSColor.controlAccentColor.usingColorSpace(.deviceRGB) else { return d diff --git a/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig index 708e2ac88..662cad2c7 100644 --- a/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_multiplatform_iOSapp_target.xcconfig @@ -47,3 +47,4 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0 SWIFT_SWIFT3_OBJC_INFERENCE = Off SWIFT_VERSION = 5.3 +OTHER_SWIFT_FLAGS = -DSWIFTUI $(inherited) diff --git a/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig b/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig index 8f1fc3a62..b664f729a 100644 --- a/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig +++ b/xcconfig/NetNewsWire_multiplatform_macOSapp_target.xcconfig @@ -44,3 +44,5 @@ PRODUCT_NAME = NetNewsWire MACOSX_DEPLOYMENT_TARGET = 10.16 SWIFT_SWIFT3_OBJC_INFERENCE = Off SWIFT_VERSION = 5.3 + +OTHER_SWIFT_FLAGS = -DSWIFTUI $(inherited)