From 7eb5a8f0734d7838bcb69be661c80787ed3f67c3 Mon Sep 17 00:00:00 2001 From: Felix Herrmann Date: Mon, 16 Jan 2023 17:52:26 +0100 Subject: [PATCH 1/2] fix Ventura toolbar placement --- Xcodes/Frontend/XcodeList/MainToolbar.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Xcodes/Frontend/XcodeList/MainToolbar.swift b/Xcodes/Frontend/XcodeList/MainToolbar.swift index dcff73a..69a48f2 100644 --- a/Xcodes/Frontend/XcodeList/MainToolbar.swift +++ b/Xcodes/Frontend/XcodeList/MainToolbar.swift @@ -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) From c496238fb91a8ffcff4613c3207b944a68db9473 Mon Sep 17 00:00:00 2001 From: Felix Herrmann Date: Mon, 16 Jan 2023 17:53:19 +0100 Subject: [PATCH 2/2] fix Ventura status bar spacing --- .../Frontend/XcodeList/BottomStatusBar.swift | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Xcodes/Frontend/XcodeList/BottomStatusBar.swift b/Xcodes/Frontend/XcodeList/BottomStatusBar.swift index ed74fe6..cd38c3b 100644 --- a/Xcodes/Frontend/XcodeList/BottomStatusBar.swift +++ b/Xcodes/Frontend/XcodeList/BottomStatusBar.swift @@ -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 {