diff --git a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift index c83922d1..97710e63 100644 --- a/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift +++ b/IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift @@ -71,12 +71,10 @@ struct DisplaySettingsView: View { Text(buttonStyle.description).tag(buttonStyle) } } - if ProcessInfo.processInfo.isiOSAppOnMac { - VStack { - Slider(value: $userPreferences.fontSizeScale, in: 0.5 ... 1.5, step: 0.1) - Text("Font scaling: \(String(format: "%.1f", userPreferences.fontSizeScale))") - .font(.scaledBody) - } + VStack { + Slider(value: $userPreferences.fontSizeScale, in: 0.5 ... 1.5, step: 0.1) + Text("Font scaling: \(String(format: "%.1f", userPreferences.fontSizeScale))") + .font(.scaledBody) } Toggle("settings.display.translate-button", isOn: $userPreferences.showTranslateButton) } diff --git a/Packages/DesignSystem/Sources/DesignSystem/Font.swift b/Packages/DesignSystem/Sources/DesignSystem/Font.swift index 7debfb31..f20fef80 100644 --- a/Packages/DesignSystem/Sources/DesignSystem/Font.swift +++ b/Packages/DesignSystem/Sources/DesignSystem/Font.swift @@ -19,7 +19,7 @@ public extension Font { return .custom(chosenFont.fontName, size: size, relativeTo: textStyle) } - return onMac ? .system(size: size) : .system(textStyle) + return .system(size: size) } private static func customUIFont(size: CGFloat) -> UIFont { @@ -31,11 +31,7 @@ public extension Font { } private static func userScaledFontSize(baseSize: CGFloat) -> CGFloat { - if onMac { - return UIFontMetrics.default.scaledValue(for: baseSize * UserPreferences.shared.fontSizeScale) - } - - return baseSize + UIFontMetrics.default.scaledValue(for: baseSize * UserPreferences.shared.fontSizeScale) } static var scaledTitle: Font {