From c453081eb67e82c08de30be21704b660ab1bfec8 Mon Sep 17 00:00:00 2001
From: Pavel Kasila <pavel.kasila@gmail.com>
Date: Tue, 22 Mar 2022 22:49:02 +0300
Subject: [PATCH] Fixes #177 and #182

---
 CodeEdit/Breadcrumbs/BreadcrumbsView.swift    | 30 ++++++++++---------
 CodeEdit/WorkspaceView.swift                  |  8 ++---
 .../StatusBarBranchPicker.swift               |  1 -
 3 files changed, 20 insertions(+), 19 deletions(-)

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 c6b51d21db..f6c6081d60 100644
--- a/CodeEdit/WorkspaceView.swift
+++ b/CodeEdit/WorkspaceView.swift
@@ -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()
diff --git a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift
index fcf9a30f87..a738066955 100644
--- a/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift
+++ b/CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift
@@ -45,7 +45,6 @@ internal struct StatusBarBranchPicker: View {
 				.font(model.toolbarFont)
 		}
 		.menuStyle(.borderlessButton)
-		.fixedSize()
 		.onHover { isHovering($0) }
 	}
 }