Skip to content

Commit 7adabea

Browse files
Wouter01Wouter01
authored
Remove new window system (#1631)
* remove new window system * remove package.resolved * Revert "remove package.resolved" This reverts commit ef752e6. * update package.resolved * downgrade pinversion * update codeeditkit to 0.1.1
1 parent 66f659a commit 7adabea

File tree

11 files changed

+63
-379
lines changed

11 files changed

+63
-379
lines changed

‎CodeEdit.xcodeproj/project.pbxproj

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -319,9 +319,6 @@
319319
6C578D8929CD36E400DC73B2 /* Commands+ForEach.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C578D8829CD36E400DC73B2 /* Commands+ForEach.swift */; };
320320
6C578D8C29CD372700DC73B2 /* ExtensionCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C578D8B29CD372700DC73B2 /* ExtensionCommands.swift */; };
321321
6C5B63DE29C76213005454BA /* WindowCodeFileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5B63DD29C76213005454BA /* WindowCodeFileView.swift */; };
322-
6C5BE51C2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */; };
323-
6C5BE51E2A3D545F002DA0FC /* FeatureFlagsSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */; };
324-
6C5BE5222A3D5666002DA0FC /* WindowManagement in Frameworks */ = {isa = PBXBuildFile; productRef = 6C5BE5212A3D5666002DA0FC /* WindowManagement */; };
325322
6C5C891B2A3F736500A94FE1 /* FocusedValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5C891A2A3F736500A94FE1 /* FocusedValues.swift */; };
326323
6C5FDF7A29E6160000BC08C0 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5FDF7929E6160000BC08C0 /* AppSettings.swift */; };
327324
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 6C66C31229D05CDC00DE9ED2 /* GRDB */; };
@@ -337,7 +334,6 @@
337334
6C6BD70429CD17B600235D17 /* ExtensionsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */; };
338335
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */; };
339336
6C7F37FE2A3EA6FA00217B83 /* View+focusedValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */; };
340-
6C7F38012A3EA71400217B83 /* WindowSplitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C7F38002A3EA71400217B83 /* WindowSplitView.swift */; };
341337
6C81916729B3E80700B75C92 /* ModifierKeysObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */; };
342338
6C81916B29B41DD300B75C92 /* DequeModule in Frameworks */ = {isa = PBXBuildFile; productRef = 6C81916A29B41DD300B75C92 /* DequeModule */; };
343339
6C82D6B329BFD88700495C54 /* NavigateCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C82D6B229BFD88700495C54 /* NavigateCommands.swift */; };
@@ -861,8 +857,6 @@
861857
6C578D8829CD36E400DC73B2 /* Commands+ForEach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Commands+ForEach.swift"; sourceTree = "<group>"; };
862858
6C578D8B29CD372700DC73B2 /* ExtensionCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionCommands.swift; sourceTree = "<group>"; };
863859
6C5B63DD29C76213005454BA /* WindowCodeFileView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowCodeFileView.swift; sourceTree = "<group>"; };
864-
6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsSettingsView.swift; sourceTree = "<group>"; };
865-
6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsSettings.swift; sourceTree = "<group>"; };
866860
6C5C891A2A3F736500A94FE1 /* FocusedValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FocusedValues.swift; sourceTree = "<group>"; };
867861
6C5FDF7929E6160000BC08C0 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
868862
6C6BD6EE29CD12E900235D17 /* ExtensionManagerWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionManagerWindow.swift; sourceTree = "<group>"; };
@@ -873,7 +867,6 @@
873867
6C6BD70329CD17B600235D17 /* ExtensionsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionsManager.swift; sourceTree = "<group>"; };
874868
6C7256D629A3D7D000C2D3E0 /* SplitViewControllerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitViewControllerView.swift; sourceTree = "<group>"; };
875869
6C7F37FD2A3EA6FA00217B83 /* View+focusedValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+focusedValue.swift"; sourceTree = "<group>"; };
876-
6C7F38002A3EA71400217B83 /* WindowSplitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowSplitView.swift; sourceTree = "<group>"; };
877870
6C81916629B3E80700B75C92 /* ModifierKeysObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModifierKeysObserver.swift; sourceTree = "<group>"; };
878871
6C82D6B229BFD88700495C54 /* NavigateCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigateCommands.swift; sourceTree = "<group>"; };
879872
6C82D6B829BFE34900495C54 /* HelpCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpCommands.swift; sourceTree = "<group>"; };
@@ -1036,7 +1029,6 @@
10361029
buildActionMask = 2147483647;
10371030
files = (
10381031
6C0F3A3C2A1D0D5000223D19 /* CodeEditKit in Frameworks */,
1039-
6C5BE5222A3D5666002DA0FC /* WindowManagement in Frameworks */,
10401032
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */,
10411033
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
10421034
6C2149412A1BB9AB00748382 /* LogStream in Frameworks */,
@@ -2373,15 +2365,6 @@
23732365
path = Environment;
23742366
sourceTree = "<group>";
23752367
};
2376-
6C5BE51A2A3D5419002DA0FC /* FeatureFlags */ = {
2377-
isa = PBXGroup;
2378-
children = (
2379-
85AEE8D42A474EEC009507BC /* Models */,
2380-
6C5BE51B2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift */,
2381-
);
2382-
path = FeatureFlags;
2383-
sourceTree = "<group>";
2384-
};
23852368
6C6BD6ED29CD123000235D17 /* Extensions */ = {
23862369
isa = PBXGroup;
23872370
children = (
@@ -2441,14 +2424,6 @@
24412424
path = Text;
24422425
sourceTree = "<group>";
24432426
};
2444-
85AEE8D42A474EEC009507BC /* Models */ = {
2445-
isa = PBXGroup;
2446-
children = (
2447-
6C5BE51D2A3D545F002DA0FC /* FeatureFlagsSettings.swift */,
2448-
);
2449-
path = Models;
2450-
sourceTree = "<group>";
2451-
};
24522427
85CD0C5D2A10CC2500E531FD /* URL */ = {
24532428
isa = PBXGroup;
24542429
children = (
@@ -2506,7 +2481,6 @@
25062481
58F2EAAE292FB2B0004A9BDE /* ThemeSettings */,
25072482
B6EA1FF329DA37D3001BF195 /* TextEditingSettings */,
25082483
5B698A082B262F8400DE9392 /* SearchSettings */,
2509-
6C5BE51A2A3D5419002DA0FC /* FeatureFlags */,
25102484
B6CF632629E5417C0085880A /* Keybindings */,
25112485
B6F0516E29D9E35300D72287 /* LocationsSettings */,
25122486
B6F0516D29D9E34200D72287 /* SourceControlSettings */,
@@ -2596,7 +2570,6 @@
25962570
B66A4E4B29C9179B004573B4 /* CodeEditApp.swift */,
25972571
04660F6027E3A68A00477777 /* Info.plist */,
25982572
6C48D8F62972E5F300D6D205 /* WindowObserver.swift */,
2599-
6C7F38002A3EA71400217B83 /* WindowSplitView.swift */,
26002573
B658FB3127DA9E0F00EA4DBD /* WorkspaceView.swift */,
26012574
5C4BB1E028212B1E00A92FB2 /* World.swift */,
26022575
);
@@ -2995,7 +2968,6 @@
29952968
6C2149402A1BB9AB00748382 /* LogStream */,
29962969
6CDEFC9529E22C2700B7C684 /* Introspect */,
29972970
6C0F3A3B2A1D0D5000223D19 /* CodeEditKit */,
2998-
6C5BE5212A3D5666002DA0FC /* WindowManagement */,
29992971
6CB4463F2B6DFF3A00539ED0 /* CodeEditSourceEditor */,
30002972
6CBE1CFF2B720565003AC32E /* CodeEditSourceEditor */,
30012973
);
@@ -3092,7 +3064,6 @@
30923064
6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */,
30933065
6CDEFC9429E22C2700B7C684 /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
30943066
6C0F3A3A2A1D0D5000223D19 /* XCRemoteSwiftPackageReference "CodeEditKit" */,
3095-
6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */,
30963067
6CBE1CFE2B720565003AC32E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
30973068
);
30983069
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
@@ -3273,7 +3244,6 @@
32733244
587B9E5E29301D8F00AC7927 /* GitLabCommitRouter.swift in Sources */,
32743245
58F2EB0D292FB2B0004A9BDE /* ThemeSettings.swift in Sources */,
32753246
85CD0C5F2A10CC3200E531FD /* URL+isImage.swift in Sources */,
3276-
6C5BE51E2A3D545F002DA0FC /* FeatureFlagsSettings.swift in Sources */,
32773247
587B9D9F29300ABD00AC7927 /* SegmentedControl.swift in Sources */,
32783248
6C7256D729A3D7D000C2D3E0 /* SplitViewControllerView.swift in Sources */,
32793249
B6EA1FE529DA33DB001BF195 /* ThemeModel.swift in Sources */,
@@ -3362,7 +3332,6 @@
33623332
587B9E6629301D8F00AC7927 /* GitLabProjectHook.swift in Sources */,
33633333
587B9E9329301D8F00AC7927 /* BitBucketOAuthConfiguration.swift in Sources */,
33643334
6C18620A298BF5A800C663EA /* RecentProjectsListView.swift in Sources */,
3365-
6C7F38012A3EA71400217B83 /* WindowSplitView.swift in Sources */,
33663335
58F2EB0A292FB2B0004A9BDE /* SettingsData.swift in Sources */,
33673336
20EBB503280C327C00F3A5DA /* HistoryInspectorView.swift in Sources */,
33683337
B6EA1FE729DA341D001BF195 /* Theme.swift in Sources */,
@@ -3450,7 +3419,6 @@
34503419
6CB9144B29BEC7F100BC47F2 /* (null) in Sources */,
34513420
587B9E7429301D8F00AC7927 /* URL+URLParameters.swift in Sources */,
34523421
61538B902B111FE800A88846 /* String+AppearancesOfSubstring.swift in Sources */,
3453-
6C5BE51C2A3D542B002DA0FC /* FeatureFlagsSettingsView.swift in Sources */,
34543422
581BFB6B2926431000D251EC /* RecentProjectItem.swift in Sources */,
34553423
587FB99029C1246400B519DD /* EditorTabView.swift in Sources */,
34563424
587B9DA429300ABD00AC7927 /* OverlayPanel.swift in Sources */,
@@ -4771,8 +4739,8 @@
47714739
isa = XCRemoteSwiftPackageReference;
47724740
repositoryURL = "https://github.com/CodeEditApp/CodeEditKit";
47734741
requirement = {
4774-
kind = exactVersion;
4775-
version = 0.1.0;
4742+
kind = upToNextMinorVersion;
4743+
minimumVersion = 0.1.0;
47764744
};
47774745
};
47784746
6C147C4329A329350089B630 /* XCRemoteSwiftPackageReference "swift-collections" */ = {
@@ -4791,14 +4759,6 @@
47914759
minimumVersion = 1.0.0;
47924760
};
47934761
};
4794-
6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */ = {
4795-
isa = XCRemoteSwiftPackageReference;
4796-
repositoryURL = "https://github.com/Wouter01/SwiftUI-WindowManagement";
4797-
requirement = {
4798-
kind = upToNextMajorVersion;
4799-
minimumVersion = 2.1.0;
4800-
};
4801-
};
48024762
6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */ = {
48034763
isa = XCRemoteSwiftPackageReference;
48044764
repositoryURL = "https://github.com/groue/GRDB.swift.git";
@@ -4869,11 +4829,6 @@
48694829
package = 6C21493F2A1BB9AB00748382 /* XCRemoteSwiftPackageReference "LogStream" */;
48704830
productName = LogStream;
48714831
};
4872-
6C5BE5212A3D5666002DA0FC /* WindowManagement */ = {
4873-
isa = XCSwiftPackageProductDependency;
4874-
package = 6C5BE5202A3D5666002DA0FC /* XCRemoteSwiftPackageReference "SwiftUI-WindowManagement" */;
4875-
productName = WindowManagement;
4876-
};
48774832
6C66C31229D05CDC00DE9ED2 /* GRDB */ = {
48784833
isa = XCSwiftPackageProductDependency;
48794834
package = 6C66C31129D05CC800DE9ED2 /* XCRemoteSwiftPackageReference "GRDB.swift" */;

‎CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 11 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CodeEdit/CodeEditApp.swift

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//
77

88
import SwiftUI
9-
import WindowManagement
109

1110
@main
1211
struct CodeEditApp: App {
@@ -33,20 +32,9 @@ struct CodeEditApp: App {
3332
AboutWindow()
3433

3534
SettingsWindow()
36-
37-
NSDocumentGroup(for: WorkspaceDocument.self) { workspace in
38-
WindowSplitView(workspace: workspace)
39-
} defaultAction: {
40-
openWindow(sceneID: .welcome)
41-
}
42-
.register(.document(WorkspaceDocument.self)) // Required to make transition modifier work
43-
.transition(.documentWindow)
44-
.windowToolbarStyle(.unifiedCompact(showsTitle: false))
45-
.enableOpenWindow() // Required for opening windows through NSApp
46-
.handlesExternalEvents(matching: [])
47-
.commands {
48-
CodeEditCommands()
49-
}
35+
.commands {
36+
CodeEditCommands()
37+
}
5038
}
5139
.environment(\.settings, settings.preferences) // Add settings to each window environment
5240
}

0 commit comments

Comments
 (0)