Skip to content

Commit 989c8e3

Browse files
- Updated UI style to adapt to macos 26
1 parent 55daa3c commit 989c8e3

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

Sources/WelcomeWindow/Views/WelcomeView.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ public struct WelcomeView<SubtitleView: View>: View {
2929
let iconImage: Image?
3030
let title: String?
3131

32+
var isMacOS26: Bool {
33+
if #available(macOS 26, *) {
34+
return true
35+
} else {
36+
return false
37+
}
38+
}
39+
3240
public init(
3341
iconImage: Image? = nil,
3442
title: String? = nil,
@@ -96,7 +104,7 @@ public struct WelcomeView<SubtitleView: View>: View {
96104
Spacer().frame(height: 40)
97105

98106
HStack {
99-
VStack(alignment: .leading, spacing: 8) {
107+
VStack(alignment: .leading, spacing: isMacOS26 ? 6 : 8) {
100108
switch actions {
101109
case .none:
102110
EmptyView()

Sources/WelcomeWindow/Views/WelcomeWindow.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ public struct WelcomeWindow<RecentsView: View, SubtitleView: View>: Scene {
1919
let iconImage: Image?
2020
let title: String?
2121

22+
var isMacOS26: Bool {
23+
if #available(macOS 26, *) {
24+
return true
25+
} else {
26+
return false
27+
}
28+
}
29+
2230
public init(
2331
iconImage: Image? = nil,
2432
title: String? = nil,
@@ -46,7 +54,7 @@ public struct WelcomeWindow<RecentsView: View, SubtitleView: View>: Scene {
4654
onDrop: onDrop,
4755
customRecentsList: customRecentsList
4856
)
49-
.frame(width: 740, height: 460)
57+
.frame(width: 740, height: isMacOS26 ? 460 - 28 : 460)
5058
.task {
5159
if let window = NSApp.findWindow(DefaultSceneID.welcome) {
5260
window.styleMask.insert(.fullSizeContentView)

Sources/WelcomeWindow/Views/WelcomeWindowView.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public struct WelcomeWindowView<RecentsView: View, SubtitleView: View>: View {
8383
}
8484
}
8585
}
86-
.clipShape(.rect(cornerRadius: 8))
8786
.cursor(.current)
8887
.edgesIgnoringSafeArea(.top)
8988
.focused($focusedField, equals: FocusTarget.none)

0 commit comments

Comments
 (0)