Skip to content

Commit c395991

Browse files
Adjusted titlebar spacing to be more accurate (#1638)
1 parent 3d3b526 commit c395991

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

CodeEdit/Features/CodeEditUI/Views/ToolbarBranchPicker.swift

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ struct ToolbarBranchPicker: View {
3131
}
3232

3333
var body: some View {
34-
HStack(alignment: .center, spacing: 5) {
35-
if currentBranch != nil {
36-
Image.branch
37-
.font(.title3)
38-
.imageScale(.medium)
39-
.foregroundColor(controlActive == .inactive ? inactiveColor : .gray)
40-
} else {
41-
Image(systemName: "folder.fill.badge.gearshape")
42-
.font(.title3)
43-
.imageScale(.medium)
44-
.foregroundColor(controlActive == .inactive ? inactiveColor : .accentColor)
34+
HStack(alignment: .center, spacing: 7) {
35+
Group {
36+
if currentBranch != nil {
37+
Image(symbol: "branch")
38+
} else {
39+
Image(systemName: "folder.fill.badge.gearshape")
40+
}
4541
}
46-
VStack(alignment: .leading, spacing: 2) {
42+
.foregroundColor(controlActive == .inactive ? inactiveColor : .secondary)
43+
.font(.system(size: 14))
44+
.imageScale(.medium)
45+
.frame(width: 17, height: 17)
46+
VStack(alignment: .leading, spacing: 0) {
4747
Text(title)
4848
.font(.headline)
4949
.foregroundColor(controlActive == .inactive ? inactiveColor : .primary)
@@ -63,6 +63,7 @@ struct ToolbarBranchPicker: View {
6363
.menuIndicator(isHovering ? .visible : .hidden)
6464
.buttonStyle(.borderless)
6565
.padding(.leading, -3)
66+
.padding(.bottom, 2)
6667
}
6768
}
6869
}

0 commit comments

Comments
 (0)