From 97ef107f4ff140ce602e62145ee7a00b6dec8f5c Mon Sep 17 00:00:00 2001 From: Tom Ludwig Date: Tue, 6 Feb 2024 16:37:41 +0100 Subject: [PATCH] Replaced accent color with foreground style on file icons --- .../Changes/Views/SourceControlNavigatorChangedFileView.swift | 3 ++- .../History/Views/CommitChangedFileListItemView.swift | 3 ++- .../Views/SourceControlNavigatorRepositoryItem.swift | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Changes/Views/SourceControlNavigatorChangedFileView.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Changes/Views/SourceControlNavigatorChangedFileView.swift index 7335b05817..746380a688 100644 --- a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Changes/Views/SourceControlNavigatorChangedFileView.swift +++ b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Changes/Views/SourceControlNavigatorChangedFileView.swift @@ -53,8 +53,9 @@ struct SourceControlNavigatorChangedFileView: View { .truncationMode(.middle) }, icon: { Image(systemName: changedFile.systemImage) + .foregroundStyle(changedFile.iconColor) }) - .accentColor(changedFile.iconColor) + Spacer() Text(changedFile.gitStatus?.description ?? "") .font(.system(size: 11, weight: .bold)) diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitChangedFileListItemView.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitChangedFileListItemView.swift index bfa78d249c..b5a496097d 100644 --- a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitChangedFileListItemView.swift +++ b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/CommitChangedFileListItemView.swift @@ -34,8 +34,9 @@ struct CommitChangedFileListItemView: View { .truncationMode(.middle) }, icon: { Image(systemName: changedFile.systemImage) + .foregroundStyle(changedFile.iconColor) }) - .accentColor(changedFile.iconColor) + Spacer() Text(changedFile.gitStatus?.description ?? "") .font(.system(size: 11, weight: .bold)) diff --git a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift index 55a22a6a76..eb43da3347 100644 --- a/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift +++ b/CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryItem.swift @@ -29,12 +29,13 @@ struct SourceControlNavigatorRepositoryItem: View { if item.symbolImage != nil { Image(symbol: item.symbolImage ?? "") .opacity(controlActiveState == .inactive ? 0.5 : 1) + .foregroundStyle(item.imageColor ?? .accentColor) } else { Image(systemName: item.systemImage ?? "") .opacity(controlActiveState == .inactive ? 0.5 : 1) + .foregroundStyle(item.imageColor ?? .accentColor) } }) - .accentColor(item.imageColor ?? .accentColor) .padding(.leading, 1) .padding(.vertical, -1) } else {