From 910563769789017d0ab0b87c3bcced2399a2e15a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 4 Aug 2023 17:17:18 -0700 Subject: [PATCH] macos: reorganize, rename, put files in groups --- macos/Ghostty.xcodeproj/project.pbxproj | 42 +++++++++++-------- macos/Sources/{Core => }/AppDelegate.swift | 0 .../Primary Window}/ErrorView.swift | 0 .../Primary Window/PrimaryView.swift} | 2 +- .../Primary Window/PrimaryWindow.swift | 2 +- .../Settings}/SettingsView.swift | 0 macos/Sources/{ => Ghostty}/AppError.swift | 0 macos/Sources/{ => Helpers}/Backport.swift | 0 .../{ => Helpers}/FullScreenHandler.swift | 0 .../SplitView/SplitView.Divider.swift | 0 .../{ => Helpers}/SplitView/SplitView.swift | 0 .../{ => Helpers}/WindowAccessor.swift | 0 12 files changed, 27 insertions(+), 19 deletions(-) rename macos/Sources/{Core => }/AppDelegate.swift (100%) rename macos/Sources/{ => Features/Primary Window}/ErrorView.swift (100%) rename macos/Sources/{ContentView.swift => Features/Primary Window/PrimaryView.swift} (99%) rename macos/Sources/{ => Features/Settings}/SettingsView.swift (100%) rename macos/Sources/{ => Ghostty}/AppError.swift (100%) rename macos/Sources/{ => Helpers}/Backport.swift (100%) rename macos/Sources/{ => Helpers}/FullScreenHandler.swift (100%) rename macos/Sources/{ => Helpers}/SplitView/SplitView.Divider.swift (100%) rename macos/Sources/{ => Helpers}/SplitView/SplitView.swift (100%) rename macos/Sources/{ => Helpers}/WindowAccessor.swift (100%) diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj index 9fef6281e..b4df4d048 100644 --- a/macos/Ghostty.xcodeproj/project.pbxproj +++ b/macos/Ghostty.xcodeproj/project.pbxproj @@ -27,7 +27,7 @@ A5CEAFDC29B8009000646FDA /* SplitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEAFDB29B8009000646FDA /* SplitView.swift */; }; A5CEAFDE29B8058B00646FDA /* SplitView.Divider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEAFDD29B8058B00646FDA /* SplitView.Divider.swift */; }; A5CEAFFF29C2410700646FDA /* Backport.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CEAFFE29C2410700646FDA /* Backport.swift */; }; - A5FECBD729D1FC3900022361 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FECBD629D1FC3900022361 /* ContentView.swift */; }; + A5FECBD729D1FC3900022361 /* PrimaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FECBD629D1FC3900022361 /* PrimaryView.swift */; }; A5FECBD929D2010400022361 /* WindowAccessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FECBD829D2010400022361 /* WindowAccessor.swift */; }; /* End PBXBuildFile section */ @@ -55,7 +55,7 @@ A5CEAFDD29B8058B00646FDA /* SplitView.Divider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitView.Divider.swift; sourceTree = ""; }; A5CEAFFE29C2410700646FDA /* Backport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Backport.swift; sourceTree = ""; }; A5D495A1299BEC7E00DD1313 /* GhosttyKit.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; path = GhosttyKit.xcframework; sourceTree = ""; }; - A5FECBD629D1FC3900022361 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + A5FECBD629D1FC3900022361 /* PrimaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryView.swift; sourceTree = ""; }; A5FECBD829D2010400022361 /* WindowAccessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowAccessor.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -75,6 +75,7 @@ isa = PBXGroup; children = ( A53426372A7DC53A00EBB7A2 /* Primary Window */, + A534263E2A7DCC5800EBB7A2 /* Settings */, ); path = Features; sourceTree = ""; @@ -85,33 +86,39 @@ A53426382A7DC55C00EBB7A2 /* PrimaryWindowManager.swift */, 85102A1B2A6E32890084AB3E /* PrimaryWindowController.swift */, 85DE1C912A6A3DCA00493853 /* PrimaryWindow.swift */, + A5FECBD629D1FC3900022361 /* PrimaryView.swift */, + A535B9D9299C569B0017E2E4 /* ErrorView.swift */, ); path = "Primary Window"; sourceTree = ""; }; - A534263A2A7DC61B00EBB7A2 /* Core */ = { + A534263D2A7DCBB000EBB7A2 /* Helpers */ = { isa = PBXGroup; children = ( - A53426342A7DA53D00EBB7A2 /* AppDelegate.swift */, + A5CEAFFE29C2410700646FDA /* Backport.swift */, + 8503D7C62A549C66006CFF3D /* FullScreenHandler.swift */, + A5FECBD829D2010400022361 /* WindowAccessor.swift */, + A5CEAFDA29B8005900646FDA /* SplitView */, ); - path = Core; + path = Helpers; + sourceTree = ""; + }; + A534263E2A7DCC5800EBB7A2 /* Settings */ = { + isa = PBXGroup; + children = ( + A59444F629A2ED5200725BBA /* SettingsView.swift */, + ); + path = Settings; sourceTree = ""; }; A54CD6ED299BEB14008C95BB /* Sources */ = { isa = PBXGroup; children = ( - A534263A2A7DC61B00EBB7A2 /* Core */, - A53426362A7DC53000EBB7A2 /* Features */, - A5CEAFDA29B8005900646FDA /* SplitView */, - A55B7BB429B6F4410055DE60 /* Ghostty */, + A53426342A7DA53D00EBB7A2 /* AppDelegate.swift */, 857F63802A5E64F200CA4815 /* MainMenu.xib */, - A535B9D9299C569B0017E2E4 /* ErrorView.swift */, - A55685DF29A03A9F004303CE /* AppError.swift */, - A59444F629A2ED5200725BBA /* SettingsView.swift */, - A5CEAFFE29C2410700646FDA /* Backport.swift */, - A5FECBD629D1FC3900022361 /* ContentView.swift */, - A5FECBD829D2010400022361 /* WindowAccessor.swift */, - 8503D7C62A549C66006CFF3D /* FullScreenHandler.swift */, + A53426362A7DC53000EBB7A2 /* Features */, + A534263D2A7DCBB000EBB7A2 /* Helpers */, + A55B7BB429B6F4410055DE60 /* Ghostty */, ); path = Sources; sourceTree = ""; @@ -123,6 +130,7 @@ A55B7BB529B6F47F0055DE60 /* AppState.swift */, A55B7BBB29B6FC330055DE60 /* SurfaceView.swift */, A55B7BBD29B701360055DE60 /* Ghostty.SplitView.swift */, + A55685DF29A03A9F004303CE /* AppError.swift */, ); path = Ghostty; sourceTree = ""; @@ -251,7 +259,7 @@ A53426352A7DA53D00EBB7A2 /* AppDelegate.swift in Sources */, A55B7BBC29B6FC330055DE60 /* SurfaceView.swift in Sources */, A59444F729A2ED5200725BBA /* SettingsView.swift in Sources */, - A5FECBD729D1FC3900022361 /* ContentView.swift in Sources */, + A5FECBD729D1FC3900022361 /* PrimaryView.swift in Sources */, A55B7BB829B6F53A0055DE60 /* Package.swift in Sources */, A55B7BBE29B701360055DE60 /* Ghostty.SplitView.swift in Sources */, A55B7BB629B6F47F0055DE60 /* AppState.swift in Sources */, diff --git a/macos/Sources/Core/AppDelegate.swift b/macos/Sources/AppDelegate.swift similarity index 100% rename from macos/Sources/Core/AppDelegate.swift rename to macos/Sources/AppDelegate.swift diff --git a/macos/Sources/ErrorView.swift b/macos/Sources/Features/Primary Window/ErrorView.swift similarity index 100% rename from macos/Sources/ErrorView.swift rename to macos/Sources/Features/Primary Window/ErrorView.swift diff --git a/macos/Sources/ContentView.swift b/macos/Sources/Features/Primary Window/PrimaryView.swift similarity index 99% rename from macos/Sources/ContentView.swift rename to macos/Sources/Features/Primary Window/PrimaryView.swift index b0cfaa6e3..adeef5574 100644 --- a/macos/Sources/ContentView.swift +++ b/macos/Sources/Features/Primary Window/PrimaryView.swift @@ -1,7 +1,7 @@ import SwiftUI import GhosttyKit -struct ContentView: View { +struct PrimaryView: View { let ghostty: Ghostty.AppState // We need access to our app delegate to know if we're quitting or not. diff --git a/macos/Sources/Features/Primary Window/PrimaryWindow.swift b/macos/Sources/Features/Primary Window/PrimaryWindow.swift index 90ba15a3c..9eccb52f2 100644 --- a/macos/Sources/Features/Primary Window/PrimaryWindow.swift +++ b/macos/Sources/Features/Primary Window/PrimaryWindow.swift @@ -23,7 +23,7 @@ class PrimaryWindow: NSWindow { backing: .buffered, defer: false) window.center() - window.contentView = NSHostingView(rootView: ContentView( + window.contentView = NSHostingView(rootView: PrimaryView( ghostty: ghostty, appDelegate: appDelegate, focusedSurfaceWrapper: window.focusedSurfaceWrapper)) diff --git a/macos/Sources/SettingsView.swift b/macos/Sources/Features/Settings/SettingsView.swift similarity index 100% rename from macos/Sources/SettingsView.swift rename to macos/Sources/Features/Settings/SettingsView.swift diff --git a/macos/Sources/AppError.swift b/macos/Sources/Ghostty/AppError.swift similarity index 100% rename from macos/Sources/AppError.swift rename to macos/Sources/Ghostty/AppError.swift diff --git a/macos/Sources/Backport.swift b/macos/Sources/Helpers/Backport.swift similarity index 100% rename from macos/Sources/Backport.swift rename to macos/Sources/Helpers/Backport.swift diff --git a/macos/Sources/FullScreenHandler.swift b/macos/Sources/Helpers/FullScreenHandler.swift similarity index 100% rename from macos/Sources/FullScreenHandler.swift rename to macos/Sources/Helpers/FullScreenHandler.swift diff --git a/macos/Sources/SplitView/SplitView.Divider.swift b/macos/Sources/Helpers/SplitView/SplitView.Divider.swift similarity index 100% rename from macos/Sources/SplitView/SplitView.Divider.swift rename to macos/Sources/Helpers/SplitView/SplitView.Divider.swift diff --git a/macos/Sources/SplitView/SplitView.swift b/macos/Sources/Helpers/SplitView/SplitView.swift similarity index 100% rename from macos/Sources/SplitView/SplitView.swift rename to macos/Sources/Helpers/SplitView/SplitView.swift diff --git a/macos/Sources/WindowAccessor.swift b/macos/Sources/Helpers/WindowAccessor.swift similarity index 100% rename from macos/Sources/WindowAccessor.swift rename to macos/Sources/Helpers/WindowAccessor.swift