Merge pull request #349 from FelixHerrmann/main

Ventura UI fixes
This commit is contained in:
Matt Kiazyk 2023-02-01 22:51:57 -06:00 committed by GitHub
commit 87cdbd7ec0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions

View file

@ -9,27 +9,27 @@
import Foundation
import SwiftUI
struct BottomStatusModifier: ViewModifier {
@EnvironmentObject var appState: AppState
func body(content: Content) -> some View {
content
VStack(spacing: 0) {
Divider()
HStack {
Text(appState.bottomStatusBarMessage)
.font(.subheadline)
Spacer()
Text(Bundle.main.shortVersion!)
.font(.subheadline)
content
VStack(spacing: 0) {
Divider()
HStack {
Text(appState.bottomStatusBarMessage)
.font(.subheadline)
Spacer()
Text(Bundle.main.shortVersion!)
.font(.subheadline)
}
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
.padding([.leading, .trailing], 10)
}
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
.padding([.leading, .trailing], 10)
}
.frame(maxWidth: .infinity, maxHeight: 30, alignment: .leading)
}
}
extension View {

View file

@ -13,12 +13,12 @@ struct MainToolbarModifier: ViewModifier {
}
private var toolbar: some ToolbarContent {
ToolbarItemGroup(placement: .status) {
ToolbarItemGroup {
Button(action: { appState.presentedSheet = .signIn }, label: {
Label("Login", systemImage: "person.circle")
})
.help("LoginDescription")
ProgressButton(
isInProgress: appState.isUpdating,
action: appState.update
@ -85,7 +85,7 @@ struct MainToolbarModifier: ViewModifier {
}
.keyboardShortcut(KeyboardShortcut("i", modifiers: [.command, .option]))
.help("InfoDescription")
Button(action: {
if #available(macOS 13, *) {
NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)