Merge pull request #67 from mock-foundation/macos

Improved macOS design
SvenTiigi · Oct 9, 2024 · 23f6a2a · 23f6a2a
2 parents 6157c77 + f3c5a85
commit 23f6a2a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/Sources/View/WhatsNewView+PrimaryButtonStyle.swift b/Sources/View/WhatsNewView+PrimaryButtonStyle.swift
@@ -26,22 +26,13 @@ extension WhatsNewView.PrimaryButtonStyle: ButtonStyle {
     func makeBody(
         configuration: Configuration
     ) -> some View {
-        Group {
-            #if os(iOS)
-            HStack {
-                Spacer()
-                configuration
-                    .label
-                    .font(.headline.weight(.semibold))
-                    .padding(.vertical)
-                Spacer()
-            }
-            #else
+        HStack {
+            Spacer()
             configuration
                 .label
-                .padding(.horizontal, 60)
-                .padding(.vertical, 8)
-            #endif
+                .font(.headline.weight(.semibold))
+                .padding(.vertical)
+            Spacer()
         }
         .foregroundColor(self.primaryAction.foregroundColor)
         .background(self.primaryAction.backgroundColor)

diff --git a/Sources/View/WhatsNewView.swift b/Sources/View/WhatsNewView.swift
@@ -104,6 +104,9 @@ extension WhatsNewView: View {
             }
             .edgesIgnoringSafeArea(.bottom)
         }
+        #if os(macOS)
+        .frame(minWidth: 400, maxWidth: 600)
+        #endif
         .sheet(
             item: self.$secondaryActionPresentedView,
             content: { $0.view }
@@ -226,15 +229,20 @@ private extension WhatsNewView {
                 Text(
                     whatsNewText: self.whatsNew.primaryAction.title
                 )
+                #if os(macOS)
+                .frame(minWidth: 150)
+                #endif
             }
+            #if os(iOS)
             .buttonStyle(
                 PrimaryButtonStyle(
                     primaryAction: self.whatsNew.primaryAction,
                     layout: self.layout
                 )
             )
-            #if os(macOS)
+            #elseif os(macOS)
             .keyboardShortcut(.defaultAction)
+            .controlSize(.large)
             #endif
         }
     }