Improves macOS UI.

- Add the shortcut for favorite as "⌘F". - Remove undo/redo menu. - Fixes an issue to show doubled detail view in macOS Monterey.
mntone · Jan 4, 2024 · 6549564 · 6549564
1 parent 28672f4
commit 6549564
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/App/MAApp.swift b/src/App/MAApp.swift
@@ -27,6 +27,9 @@ struct MAApp: SwiftUI.App {
 #endif
 #if os(macOS)
 		.commands {
+			CommandGroup(replacing: .undoRedo) {
+			}
+
 			CommandGroup(replacing: .appInfo) {
 				Button("About Prof. Monster") {
 					NSApplication.shared.orderFrontStandardAboutPanel(options: [

diff --git a/src/App/Views/Details/FavoriteButton.swift b/src/App/Views/Details/FavoriteButton.swift
@@ -30,6 +30,7 @@ struct FavoriteButton<ViewModel: FavoriteViewModel>: View {
 #if os(iOS)
 		.tint(.yellow)
 #endif
+		.keyboardShortcut("F", modifiers: .command)
 #endif
 	}
 }
diff --git a/src/App/Views/Navigations/NavigationSplitViewHost.swift b/src/App/Views/Navigations/NavigationSplitViewHost.swift
@@ -125,15 +125,8 @@ struct NavigationSplitViewHostBackport: View {
 #if os(macOS)
 			Sidebar(viewModel: viewModel, selection: $selectedGameID)
 			MonsterList(viewModel: gameViewModel, selection: $selectedMonsterID)
-
-			if let monsterViewModel {
-				MonsterView(viewModel: monsterViewModel)
-			} else {
-				Color.monsterBackground.ignoresSafeArea()
-			}
 #else
 			SidebarBackport(viewModel: viewModel, selection: $selectedGameID)
-
 			GamePage(viewModel: gameViewModel) { item in
 				MonsterSelectableListItem(viewModel: item, selection: $selectedMonsterID)
 			}