Fix: Fixed issue where custom font wasn't applied to the details pane (#12554)

Author: QuaintMako

src/Files.App/Constants.cs

@@ -103,6 +103,11 @@ public static class UI
 			public const double ContextMenuItemsMaxWidth = 250;
 		}
 
+		public static class Appearance
+		{
+			public const string StandardFont = "Segoe UI Variable";
+		}
+
 		public static class Browser
 		{
 			public static class GridViewBrowser

src/Files.App/Helpers/AppThemeResourcesHelper.cs

@@ -25,22 +25,22 @@ public static void LoadAppResources(this IResourcesService service, IAppearanceS
 			service.SetCompactSpacing(useCompactStyles);
 			service.SetAppThemeBackgroundColor(appThemeBackgroundColor.FromWindowsColor());
 
-			if (!String.IsNullOrWhiteSpace(appThemeAddressBarBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
+			if (!string.IsNullOrWhiteSpace(appThemeAddressBarBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
 				service.SetAppThemeAddressBarBackgroundColor(ColorHelper.ToColor(appThemeAddressBarBackgroundColor).FromWindowsColor());
 			else
 				appearance.AppThemeAddressBarBackgroundColor = ""; //migrate to new default
 
-			if (!String.IsNullOrWhiteSpace(appThemeSidebarBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
+			if (!string.IsNullOrWhiteSpace(appThemeSidebarBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
 				service.SetAppThemeSidebarBackgroundColor(ColorHelper.ToColor(appThemeSidebarBackgroundColor).FromWindowsColor());
 			else
 				appearance.AppThemeSidebarBackgroundColor = ""; //migrate to new default
 
-			if (!String.IsNullOrWhiteSpace(appThemeFileAreaBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
+			if (!string.IsNullOrWhiteSpace(appThemeFileAreaBackgroundColor) && appThemeAddressBarBackgroundColor != "#00000000")
 				service.SetAppThemeFileAreaBackgroundColor(ColorHelper.ToColor(appThemeFileAreaBackgroundColor).FromWindowsColor());
 			else
 				appearance.AppThemeFileAreaBackgroundColor = ""; //migrate to new default
 
-			if (appThemeFontFamily != "Segoe UI Variable")
+			if (appThemeFontFamily != Constants.Appearance.StandardFont)
 				service.SetAppThemeFontFamily(appThemeFontFamily);
 
 			service.ApplyResources();

src/Files.App/UserControls/Pane/PreviewPane.xaml

@@ -113,6 +113,11 @@
 						</Setter>
 					</Style>
 
+					<Style x:Key="Local.FileDetailsTextBlockStyle" TargetType="TextBlock">
+						<Setter Property="FontWeight" Value="Normal" />
+						<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+					</Style>
+
 				</ResourceDictionary>
 			</ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
@@ -205,14 +210,14 @@
 				<TextBlock
 					x:Name="DetailsListHeader"
 					HorizontalAlignment="Center"
+					FontFamily="{ThemeResource ContentControlThemeFontFamily}"
 					FontSize="20"
 					FontWeight="Bold"
 					IsTextSelectionEnabled="True"
 					Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
 					TextAlignment="Center"
 					TextWrapping="Wrap"
 					Visibility="Collapsed" />
-
 				<ItemsControl
 					x:Name="FileDetailsRepeater"
 					Margin="12"
@@ -233,7 +238,7 @@
 									HorizontalAlignment="Stretch"
 									VerticalAlignment="Center"
 									MaxLines="2"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource Local.FileDetailsTextBlockStyle}"
 									Text="{x:Bind Name, Mode=OneWay}" />
 
 								<!--  Value  -->
@@ -356,4 +361,4 @@
 			</VisualStateGroup>
 		</VisualStateManager.VisualStateGroups>
 	</Grid>
-</UserControl>
+</UserControl>

src/Files.App/ViewModels/Previews/FolderPreviewViewModel.cs

@@ -47,10 +47,9 @@ private async Task LoadPreviewAndDetailsAsync()
 				GetFileProperty("PropertyDateModified", dateTimeFormatter.ToLongLabel(info.DateModified)),
 				GetFileProperty("PropertyDateCreated", dateTimeFormatter.ToLongLabel(info.ItemDate)),
 				GetFileProperty("PropertyItemPathDisplay", Folder.Path),
+				GetFileProperty("FileTags",
+				Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.Name)) : null)
 			};
-
-			Item.FileDetails.Add(GetFileProperty("FileTags",
-				Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.Name)) : null));
 		}
 
 		private static FileProperty GetFileProperty(string nameResource, object value)