Fix: Fixed issue where widths of Git columns were not set correctly (#12732)

Author: hishitetsu

src/Files.App/Data/Models/ColumnsViewModel.cs

@@ -133,6 +133,11 @@ public ColumnViewModel SizeColumn
 		[LiteDB.BsonIgnore]
 		public double TotalWidth =>
 			IconColumn.Length.Value +
+			GitStatusColumn.Length.Value +
+			GitLastCommitDateColumn.Length.Value +
+			GitLastCommitMessageColumn.Length.Value +
+			GitCommitAuthorColumn.Length.Value +
+			GitLastCommitShaColumn.Length.Value +
 			TagColumn.Length.Value +
 			NameColumn.Length.Value +
 			DateModifiedColumn.Length.Value +
@@ -160,6 +165,11 @@ public void SetDesiredSize(double width)
 		private void SetColumnSizeProportionally(double factor)
 		{
 			NameColumn.TryMultiplySize(factor);
+			GitStatusColumn.TryMultiplySize(factor);
+			GitLastCommitDateColumn.TryMultiplySize(factor);
+			GitLastCommitMessageColumn.TryMultiplySize(factor);
+			GitCommitAuthorColumn.TryMultiplySize(factor);
+			GitLastCommitShaColumn.TryMultiplySize(factor);
 			TagColumn.TryMultiplySize(factor);
 			DateModifiedColumn.TryMultiplySize(factor);
 			OriginalPathColumn.TryMultiplySize(factor);
@@ -189,7 +199,12 @@ public override bool Equals(object? obj)
 					model.OriginalPathColumn.Equals(OriginalPathColumn) &&
 					model.SizeColumn.Equals(SizeColumn) &&
 					model.StatusColumn.Equals(StatusColumn) &&
-					model.TagColumn.Equals(TagColumn);
+					model.TagColumn.Equals(TagColumn) &&
+					model.GitStatusColumn.Equals(GitStatusColumn) &&
+					model.GitLastCommitDateColumn.Equals(GitLastCommitDateColumn) &&
+					model.GitLastCommitMessageColumn.Equals(GitLastCommitMessageColumn) &&
+					model.GitCommitAuthorColumn.Equals(GitCommitAuthorColumn) &&
+					model.GitLastCommitShaColumn.Equals(GitLastCommitShaColumn);
 			}
 
 			return base.Equals(obj);
@@ -206,6 +221,11 @@ public override int GetHashCode()
 			hashCode = (hashCode * 397) ^ SizeColumn.GetHashCode();
 			hashCode = (hashCode * 397) ^ StatusColumn.GetHashCode();
 			hashCode = (hashCode * 397) ^ TagColumn.GetHashCode();
+			hashCode = (hashCode * 397) ^ GitStatusColumn.GetHashCode();
+			hashCode = (hashCode * 397) ^ GitLastCommitDateColumn.GetHashCode();
+			hashCode = (hashCode * 397) ^ GitLastCommitMessageColumn.GetHashCode();
+			hashCode = (hashCode * 397) ^ GitCommitAuthorColumn.GetHashCode();
+			hashCode = (hashCode * 397) ^ GitLastCommitShaColumn.GetHashCode();
 
 			return hashCode;
 		}

src/Files.App/Helpers/LayoutPreferences/LayoutPreferences.cs

@@ -56,11 +56,11 @@ public LayoutPreferences()
 			ColumnsViewModel.DateCreatedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateCreatedColumnWidth;
 			ColumnsViewModel.ItemTypeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TypeColumnWidth;
 			ColumnsViewModel.SizeColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.SizeColumnWidth;
-			ColumnsViewModel.GitStatusColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.SizeColumnWidth;
-			ColumnsViewModel.GitLastCommitDateColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.SizeColumnWidth;
-			ColumnsViewModel.GitLastCommitMessageColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.SizeColumnWidth;
-			ColumnsViewModel.GitCommitAuthorColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.SizeColumnWidth;
-			ColumnsViewModel.GitLastCommitShaColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.SizeColumnWidth;
+			ColumnsViewModel.GitStatusColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.GitStatusColumnWidth;
+			ColumnsViewModel.GitLastCommitDateColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.GitLastCommitDateColumnWidth;
+			ColumnsViewModel.GitLastCommitMessageColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.GitLastCommitMessageColumnWidth;
+			ColumnsViewModel.GitCommitAuthorColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.GitCommitAuthorColumnWidth;
+			ColumnsViewModel.GitLastCommitShaColumn.UserLengthPixels= UserSettingsService.FoldersSettingsService.GitLastCommitShaColumnWidth;
 			ColumnsViewModel.TagColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.TagColumnWidth;
 			ColumnsViewModel.DateDeletedColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.DateDeletedColumnWidth;
 			ColumnsViewModel.OriginalPathColumn.UserLengthPixels = UserSettingsService.FoldersSettingsService.OriginalPathColumnWidth;

src/Files.App/Services/Settings/FoldersSettingsService.cs

@@ -373,6 +373,11 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 			{
 				case nameof(SyncFolderPreferencesAcrossDirectories):
 				case nameof(DefaultLayoutMode):
+				case nameof(GitStatusColumnWidth):
+				case nameof(GitLastCommitDateColumnWidth):
+				case nameof(GitLastCommitMessageColumnWidth):
+				case nameof(GitCommitAuthorColumnWidth):
+				case nameof(GitLastCommitShaColumnWidth):
 				case nameof(TagColumnWidth):
 				case nameof(NameColumnWidth):
 				case nameof(DateModifiedColumnWidth):
@@ -383,6 +388,11 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(ShowDateCreatedColumn):
 				case nameof(ShowTypeColumn):
 				case nameof(ShowSizeColumn):
+				case nameof(ShowGitStatusColumn):
+				case nameof(ShowGitLastCommitDateColumn):
+				case nameof(ShowGitLastCommitMessageColumn):
+				case nameof(ShowGitCommitAuthorColumn):
+				case nameof(ShowGitLastCommitShaColumn):
 				case nameof(ShowFileTagColumn):
 				case nameof(ShowHiddenItems):
 				case nameof(ShowProtectedSystemFiles):