diff --git a/CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved index ee206aceba..f1b426ad69 100644 --- a/CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -3,7 +3,7 @@ "pins": [ { "package": "Highlightr", - "repositoryURL": "https://github.com/raspu/Highlightr", + "repositoryURL": "https://github.com/raspu/Highlightr.git", "state": { "branch": null, "revision": "93199b9e434f04bda956a613af8f571933f9f037", diff --git a/CodeEdit/Breadcrumbs/BreadcrumbsView.swift b/CodeEdit/Breadcrumbs/BreadcrumbsView.swift index 833818d05f..616bd49541 100644 --- a/CodeEdit/Breadcrumbs/BreadcrumbsView.swift +++ b/CodeEdit/Breadcrumbs/BreadcrumbsView.swift @@ -27,22 +27,24 @@ struct BreadcrumbsView: View { ZStack(alignment: .leading) { Rectangle() .foregroundStyle(Color(nsColor: .controlBackgroundColor)) - HStack { - BreadcrumbsComponent( - projectName, - systemImage: "square.dashed.inset.filled", - color: .accentColor - ) + ScrollView(.horizontal, showsIndicators: false) { + HStack { + BreadcrumbsComponent( + projectName, + systemImage: "square.dashed.inset.filled", + color: .accentColor + ) - chevron + chevron - ForEach(folders, id: \.self) { folder in - BreadcrumbsComponent(folder, systemImage: "folder.fill") - chevron - } - BreadcrumbsComponent(fileName, systemImage: fileImage, color: file.iconColor) - } - .padding(.leading, 12) + ForEach(folders, id: \.self) { folder in + BreadcrumbsComponent(folder, systemImage: "folder.fill") + chevron + } + BreadcrumbsComponent(fileName, systemImage: fileImage, color: file.iconColor) + } + .padding(.horizontal, 12) + } } .frame(height: 29) .overlay(alignment: .bottom) { diff --git a/CodeEdit/WorkspaceView.swift b/CodeEdit/WorkspaceView.swift index caa751d35a..9b4b81b09e 100644 --- a/CodeEdit/WorkspaceView.swift +++ b/CodeEdit/WorkspaceView.swift @@ -31,17 +31,11 @@ struct WorkspaceView: View { NavigatorSidebar(workspace: workspace, windowController: windowController) .frame(minWidth: 250) HSplitView { - WorkspaceCodeFileView( - windowController: windowController, - workspace: workspace - ) - .frame(maxWidth: .infinity, maxHeight: .infinity) - - InspectorSidebar( - workspace: workspace, - windowController: windowController - ) - .frame(minWidth: 250, maxWidth: .infinity, maxHeight: .infinity) + WorkspaceCodeFileView(windowController: windowController, + workspace: workspace) + .frame(maxWidth: .infinity, maxHeight: .infinity) + InspectorSidebar(workspace: workspace, windowController: windowController) + .frame(minWidth: 250, maxWidth: .infinity, maxHeight: .infinity) } } else { EmptyView()