Skip to content

Commit 87cdbd7

Browse files
authored
Merge pull request #349 from FelixHerrmann/main
Ventura UI fixes
2 parents 4a48d55 + c496238 commit 87cdbd7

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

Xcodes/Frontend/XcodeList/BottomStatusBar.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
import Foundation
1010
import SwiftUI
1111

12-
1312
struct BottomStatusModifier: ViewModifier {
1413
@EnvironmentObject var appState: AppState
1514

1615
func body(content: Content) -> some View {
17-
content
1816
VStack(spacing: 0) {
19-
Divider()
20-
HStack {
21-
Text(appState.bottomStatusBarMessage)
22-
.font(.subheadline)
23-
Spacer()
24-
Text(Bundle.main.shortVersion!)
25-
.font(.subheadline)
17+
content
18+
VStack(spacing: 0) {
19+
Divider()
20+
HStack {
21+
Text(appState.bottomStatusBarMessage)
22+
.font(.subheadline)
23+
Spacer()
24+
Text(Bundle.main.shortVersion!)
25+
.font(.subheadline)
26+
}
27+
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
28+
.padding([.leading, .trailing], 10)
2629
}
2730
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
28-
.padding([.leading, .trailing], 10)
2931
}
30-
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
3132
}
32-
3333
}
3434

3535
extension View {

Xcodes/Frontend/XcodeList/MainToolbar.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ struct MainToolbarModifier: ViewModifier {
1313
}
1414

1515
private var toolbar: some ToolbarContent {
16-
ToolbarItemGroup(placement: .status) {
16+
ToolbarItemGroup {
1717
Button(action: { appState.presentedSheet = .signIn }, label: {
1818
Label("Login", systemImage: "person.circle")
1919
})
2020
.help("LoginDescription")
21-
21+
2222
ProgressButton(
2323
isInProgress: appState.isUpdating,
2424
action: appState.update
@@ -85,7 +85,7 @@ struct MainToolbarModifier: ViewModifier {
8585
}
8686
.keyboardShortcut(KeyboardShortcut("i", modifiers: [.command, .option]))
8787
.help("InfoDescription")
88-
88+
8989
Button(action: {
9090
if #available(macOS 13, *) {
9191
NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)

0 commit comments

Comments
 (0)