Skip to content

Added scrollable breadcrumb, fixed sidebar moving to far left #186

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
lukepistrol merged 2 commits into from
Mar 23, 2022
Merged

Added scrollable breadcrumb, fixed sidebar moving to far left #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c453081
Fixes #177 and #182
pkasila Mar 22, 2022
495d1d0
Merge branch 'codeeditapp/main'
pkasila Mar 23, 2022
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
30 changes: 16 additions & 14 deletions CodeEdit/Breadcrumbs/BreadcrumbsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions CodeEdit/WorkspaceView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ struct WorkspaceView: View {
.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)
workspace: workspace)
.frame(maxWidth: .infinity, maxHeight: .infinity)
InspectorSidebar(workspace: workspace, windowController: windowController)
.frame(minWidth: 250, maxWidth: .infinity, maxHeight: .infinity)
}
} else {
EmptyView()
Expand Down
1 change: 0 additions & 1 deletion CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ internal struct StatusBarBranchPicker: View {
.font(model.toolbarFont)
}
.menuStyle(.borderlessButton)
.fixedSize()
.onHover { isHovering($0) }

@lukepistrol lukepistrol Mar 23, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change can be omitted since it was already fixed in #196

}
}