Skip to content

Remove new window system #1631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austincondiff merged 6 commits into from
Mar 21, 2024
Merged

Remove new window system #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3d8a42
remove new window system
Wouter01 Mar 18, 2024
ef752e6
remove package.resolved
Wouter01 Mar 18, 2024
25aad66
Revert "remove package.resolved"
Wouter01 Mar 21, 2024
4ebe1af
update package.resolved
Wouter01 Mar 21, 2024
11a333f
downgrade pinversion
Wouter01 Mar 21, 2024
5574e25
update codeeditkit to 0.1.1
Wouter01 Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 2 additions & 47 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,6 @@
6C578D8929CD36E400DC73B2 /* Commands+ForEach.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C578D8829CD36E400DC73B2 /* Commands+ForEach.swift */; };
6C578D8C29CD372700DC73B2 /* ExtensionCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C578D8B29CD372700DC73B2 /* ExtensionCommands.swift */; };
6C5B63DE29C76213005454BA /* WindowCodeFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5B63DD29C76213005454BA /* WindowCodeFileView.swift */; };
6C5BE51C2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */; };
6C5BE51E2A3D545F002DA0FC /* FeatureFlagsSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */; };
6C5BE5222A3D5666002DA0FC /* WindowManagement in Frameworks */ = {isa = PBXBuildFile; productRef = 6C5BE5212A3D5666002DA0FC /* WindowManagement */; };
6C5C891B2A3F736500A94FE1 /* FocusedValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5C891A2A3F736500A94FE1 /* FocusedValues.swift */; };
6C5FDF7A29E6160000BC08C0 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5FDF7929E6160000BC08C0 /* AppSettings.swift */; };
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
Expand All @@ -337,7 +334,6 @@
6C6BD70429CD17B600235D17 /* ExtensionsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */; };
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */; };
6C7F37FE2A3EA6FA00217B83 /* View+focusedValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */; };
6C7F38012A3EA71400217B83 /* WindowSplitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F38002A3EA71400217B83 /* WindowSplitView.swift */; };
6C81916729B3E80700B75C92 /* ModifierKeysObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */; };
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 6C81916A29B41DD300B75C92 /* DequeModule */; };
6C82D6B329BFD88700495C54 /* NavigateCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C82D6B229BFD88700495C54 /* NavigateCommands.swift */; };
Expand Down Expand Up @@ -861,8 +857,6 @@
6C578D8829CD36E400DC73B2 /* Commands+ForEach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Commands+ForEach.swift"; sourceTree = "<group>"; };
6C578D8B29CD372700DC73B2 /* ExtensionCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionCommands.swift; sourceTree = "<group>"; };
6C5B63DD29C76213005454BA /* WindowCodeFileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowCodeFileView.swift; sourceTree = "<group>"; };
6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsSettingsView.swift; sourceTree = "<group>"; };
6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsSettings.swift; sourceTree = "<group>"; };
6C5C891A2A3F736500A94FE1 /* FocusedValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusedValues.swift; sourceTree = "<group>"; };
6C5FDF7929E6160000BC08C0 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
6C6BD6EE29CD12E900235D17 /* ExtensionManagerWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionManagerWindow.swift; sourceTree = "<group>"; };
Expand All @@ -873,7 +867,6 @@
6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionsManager.swift; sourceTree = "<group>"; };
6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewControllerView.swift; sourceTree = "<group>"; };
6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+focusedValue.swift"; sourceTree = "<group>"; };
6C7F38002A3EA71400217B83 /* WindowSplitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowSplitView.swift; sourceTree = "<group>"; };
6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModifierKeysObserver.swift; sourceTree = "<group>"; };
6C82D6B229BFD88700495C54 /* NavigateCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigateCommands.swift; sourceTree = "<group>"; };
6C82D6B829BFE34900495C54 /* HelpCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpCommands.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1036,7 +1029,6 @@
buildActionMask = 2147483647;
files = (
6C0F3A3C2A1D0D5000223D19 /* CodeEditKit in Frameworks */,
6C5BE5222A3D5666002DA0FC /* WindowManagement in Frameworks */,
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */,
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
6C2149412A1BB9AB00748382 /* LogStream in Frameworks */,
Expand Down Expand Up @@ -2373,15 +2365,6 @@
path = Environment;
sourceTree = "<group>";
};
6C5BE51A2A3D5419002DA0FC /* FeatureFlags */ = {
isa = PBXGroup;
children = (
85AEE8D42A474EEC009507BC /* Models */,
6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */,
);
path = FeatureFlags;
sourceTree = "<group>";
};
6C6BD6ED29CD123000235D17 /* Extensions */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2441,14 +2424,6 @@
path = Text;
sourceTree = "<group>";
};
85AEE8D42A474EEC009507BC /* Models */ = {
isa = PBXGroup;
children = (
6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */,
);
path = Models;
sourceTree = "<group>";
};
85CD0C5D2A10CC2500E531FD /* URL */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2506,7 +2481,6 @@
58F2EAAE292FB2B0004A9BDE /* ThemeSettings */,
B6EA1FF329DA37D3001BF195 /* TextEditingSettings */,
5B698A082B262F8400DE9392 /* SearchSettings */,
6C5BE51A2A3D5419002DA0FC /* FeatureFlags */,
B6CF632629E5417C0085880A /* Keybindings */,
B6F0516E29D9E35300D72287 /* LocationsSettings */,
B6F0516D29D9E34200D72287 /* SourceControlSettings */,
Expand Down Expand Up @@ -2596,7 +2570,6 @@
B66A4E4B29C9179B004573B4 /* CodeEditApp.swift */,
04660F6027E3A68A00477777 /* Info.plist */,
6C48D8F62972E5F300D6D205 /* WindowObserver.swift */,
6C7F38002A3EA71400217B83 /* WindowSplitView.swift */,
B658FB3127DA9E0F00EA4DBD /* WorkspaceView.swift */,
5C4BB1E028212B1E00A92FB2 /* World.swift */,
);
Expand Down Expand Up @@ -2995,7 +2968,6 @@
6C2149402A1BB9AB00748382 /* LogStream */,
6CDEFC9529E22C2700B7C684 /* Introspect */,
6C0F3A3B2A1D0D5000223D19 /* CodeEditKit */,
6C5BE5212A3D5666002DA0FC /* WindowManagement */,
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */,
6CBE1CFF2B720565003AC32E /* CodeEditSourceEditor */,
);
Expand Down Expand Up @@ -3092,7 +3064,6 @@
6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */,
6CDEFC9429E22C2700B7C684 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */,
6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */,
6CBE1CFE2B720565003AC32E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
);
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
Expand Down Expand Up @@ -3273,7 +3244,6 @@
587B9E5E29301D8F00AC7927 /* GitLabCommitRouter.swift in Sources */,
58F2EB0D292FB2B0004A9BDE /* ThemeSettings.swift in Sources */,
85CD0C5F2A10CC3200E531FD /* URL+isImage.swift in Sources */,
6C5BE51E2A3D545F002DA0FC /* FeatureFlagsSettings.swift in Sources */,
587B9D9F29300ABD00AC7927 /* SegmentedControl.swift in Sources */,
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */,
B6EA1FE529DA33DB001BF195 /* ThemeModel.swift in Sources */,
Expand Down Expand Up @@ -3362,7 +3332,6 @@
587B9E6629301D8F00AC7927 /* GitLabProjectHook.swift in Sources */,
587B9E9329301D8F00AC7927 /* BitBucketOAuthConfiguration.swift in Sources */,
6C18620A298BF5A800C663EA /* RecentProjectsListView.swift in Sources */,
6C7F38012A3EA71400217B83 /* WindowSplitView.swift in Sources */,
58F2EB0A292FB2B0004A9BDE /* SettingsData.swift in Sources */,
20EBB503280C327C00F3A5DA /* HistoryInspectorView.swift in Sources */,
B6EA1FE729DA341D001BF195 /* Theme.swift in Sources */,
Expand Down Expand Up @@ -3450,7 +3419,6 @@
6CB9144B29BEC7F100BC47F2 /* (null) in Sources */,
587B9E7429301D8F00AC7927 /* URL+URLParameters.swift in Sources */,
61538B902B111FE800A88846 /* String+AppearancesOfSubstring.swift in Sources */,
6C5BE51C2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift in Sources */,
581BFB6B2926431000D251EC /* RecentProjectItem.swift in Sources */,
587FB99029C1246400B519DD /* EditorTabView.swift in Sources */,
587B9DA429300ABD00AC7927 /* OverlayPanel.swift in Sources */,
Expand Down Expand Up @@ -4771,8 +4739,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/CodeEditApp/CodeEditKit";
requirement = {
kind = exactVersion;
version = 0.1.0;
kind = upToNextMinorVersion;
minimumVersion = 0.1.0;
};
};
6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */ = {
Expand All @@ -4791,14 +4759,6 @@
minimumVersion = 1.0.0;
};
};
6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Wouter01/SwiftUI-WindowManagement";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.1.0;
};
};
6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/groue/GRDB.swift.git";
Expand Down Expand Up @@ -4869,11 +4829,6 @@
package = 6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */;
productName = LogStream;
};
6C5BE5212A3D5666002DA0FC /* WindowManagement */ = {
isa = XCSwiftPackageProductDependency;
package = 6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */;
productName = WindowManagement;
};
6C66C31229D05CDC00DE9ED2 /* GRDB */ = {
isa = XCSwiftPackageProductDependency;
package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */;
Expand Down
93 changes: 11 additions & 82 deletions CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 3 additions & 15 deletions CodeEdit/CodeEditApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import SwiftUI
import WindowManagement

@main
struct CodeEditApp: App {
Expand All @@ -33,20 +32,9 @@ struct CodeEditApp: App {
AboutWindow()

SettingsWindow()

NSDocumentGroup(for: WorkspaceDocument.self) { workspace in
WindowSplitView(workspace: workspace)
} defaultAction: {
openWindow(sceneID: .welcome)
}
.register(.document(WorkspaceDocument.self)) // Required to make transition modifier work
.transition(.documentWindow)
.windowToolbarStyle(.unifiedCompact(showsTitle: false))
.enableOpenWindow() // Required for opening windows through NSApp
.handlesExternalEvents(matching: [])
.commands {
CodeEditCommands()
}
.commands {
CodeEditCommands()
}
}
.environment(\.settings, settings.preferences) // Add settings to each window environment
}
Expand Down
Loading