File tree Expand file tree Collapse file tree 3 files changed +10
-6
lines changed
NavigatorArea/SourceControlNavigator/Views Expand file tree Collapse file tree 3 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -35,8 +35,8 @@ struct ToolbarBranchPicker: View {
35
35
if currentBranch != nil {
36
36
Image . branch
37
37
. font ( . title3)
38
- . imageScale ( . large )
39
- . foregroundColor ( controlActive == . inactive ? inactiveColor : . primary )
38
+ . imageScale ( . medium )
39
+ . foregroundColor ( controlActive == . inactive ? inactiveColor : . gray )
40
40
} else {
41
41
Image ( systemName: " folder.fill.badge.gearshape " )
42
42
. font ( . title3)
@@ -57,9 +57,10 @@ struct ToolbarBranchPicker: View {
57
57
} , label: {
58
58
Text ( currentBranch. name)
59
59
. font ( . subheadline)
60
- . foregroundColor ( controlActive == . inactive ? inactiveColor : . secondary )
60
+ . foregroundColor ( controlActive == . inactive ? inactiveColor : . gray )
61
61
. frame ( height: 11 )
62
62
} )
63
+ . menuIndicator ( isHovering ? . visible : . hidden)
63
64
. buttonStyle ( . borderless)
64
65
. padding ( . leading, - 3 )
65
66
}
Original file line number Diff line number Diff line change @@ -25,8 +25,11 @@ extension GitClient {
25
25
if let branchName { branchNameString = " --first-parent \( branchName) " }
26
26
if let maxCount { maxCountString = " -n \( maxCount) " }
27
27
let dateFormatter = DateFormatter ( )
28
- dateFormatter. locale = Locale . current
28
+
29
+ // Can't use `Locale.current`, since it'd give a nil date outside the US
30
+ dateFormatter. locale = Locale ( identifier: Locale . current. identifier)
29
31
dateFormatter. dateFormat = " EEE, dd MMM yyyy HH:mm:ss Z "
32
+
30
33
let output = try await run (
31
34
" log --pretty=%h¦%H¦%s¦%aN¦%ae¦%cn¦%ce¦%aD¦ \( maxCountString) \( branchNameString) \( fileLocalPath) "
32
35
. trimmingCharacters ( in: . whitespacesAndNewlines)
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ struct SourceControlNavigatorView: View {
13
13
var body : some View {
14
14
if let sourceControlManager = workspace. workspaceFileManager? . sourceControlManager {
15
15
VStack ( spacing: 0 ) {
16
- SourcControlNavigatorTabs ( )
16
+ SourceControlNavigatorTabs ( )
17
17
. environmentObject ( sourceControlManager)
18
18
. task {
19
19
do {
@@ -34,7 +34,7 @@ struct SourceControlNavigatorView: View {
34
34
}
35
35
}
36
36
37
- struct SourcControlNavigatorTabs : View {
37
+ struct SourceControlNavigatorTabs : View {
38
38
@EnvironmentObject var sourceControlManager : SourceControlManager
39
39
@State private var selectedSection : Int = 0
40
40
You can’t perform that action at this time.
0 commit comments