Skip to content

Commit bf74654

Browse files
committed
Add Padding to Side Tabs
1 parent 326319b commit bf74654

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

CodeEdit/Features/CodeEditUI/Views/WorkspacePanel/WorkspacePanelView.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
1919
var darkDivider: Bool
2020
let padSideItemVertically: Bool
2121
let sideOnTrailing: Bool
22+
let sidebarPadding: () -> (Edge.Set, CGFloat)
2223
let bottomAccessory: BottomAccessory
2324

2425
init(
@@ -29,6 +30,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
2930
darkDivider: Bool = false,
3031
padSideItemVertically: Bool = false,
3132
sideOnTrailing: Bool = false,
33+
sidebarPadding: @escaping () -> (Edge.Set, CGFloat) = { ([], 0) },
3234
@ViewBuilder bottomAccessory: () -> BottomAccessory
3335
) {
3436
self.viewModel = viewModel
@@ -42,6 +44,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
4244
} else {
4345
self.sideOnTrailing = false
4446
}
47+
self.sidebarPadding = sidebarPadding
4548
self.bottomAccessory = bottomAccessory()
4649
}
4750

@@ -52,6 +55,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
5255
sidebarPosition: SettingsData.SidebarTabBarPosition,
5356
darkDivider: Bool = false,
5457
padSideItemVertically: Bool = false,
58+
sidebarPadding: @escaping () -> (Edge.Set, CGFloat) = { ([], 0) },
5559
sideOnTrailing: Bool = false,
5660
) where BottomAccessory == EmptyView {
5761
self.viewModel = viewModel
@@ -65,6 +69,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
6569
} else {
6670
self.sideOnTrailing = false
6771
}
72+
self.sidebarPadding = sidebarPadding
6873
self.bottomAccessory = EmptyView()
6974
}
7075

@@ -83,12 +88,12 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
8388
}
8489
.safeAreaInset(edge: .leading, spacing: 0) {
8590
if sidebarPosition == .side && !sideOnTrailing {
86-
sideTabBar
91+
sideTabBar.padding(sidebarPadding().0, sidebarPadding().1)
8792
}
8893
}
8994
.safeAreaInset(edge: .trailing, spacing: 0) {
9095
if sidebarPosition == .side && sideOnTrailing {
91-
sideTabBar
96+
sideTabBar.padding(sidebarPadding().0, sidebarPadding().1)
9297
}
9398
}
9499
.safeAreaInset(edge: .top, spacing: 0) {
@@ -104,6 +109,7 @@ struct WorkspacePanelView<Tab: WorkspacePanelTab, ViewModel: ObservableObject, B
104109
Divider()
105110
}
106111
}
112+
.padding(sidebarPadding().0, sidebarPadding().1)
107113
} else if !darkDivider, #unavailable(macOS 26) {
108114
Divider()
109115
}

CodeEdit/Features/NavigatorArea/Views/NavigatorAreaView.swift

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ struct NavigatorAreaView: View {
3939
selectedTab: $viewModel.selectedTab,
4040
tabItems: $viewModel.tabItems,
4141
sidebarPosition: sidebarPosition,
42+
sidebarPadding: {
43+
if sidebarPosition == .side {
44+
return (.trailing, 8)
45+
}
46+
47+
return ([], 0)
48+
},
4249
bottomAccessory: {
4350
viewModel.selectedTab?.bottomView(workspace: workspace)
4451
}

0 commit comments

Comments
 (0)