Feature: Added support for "Thin acrylic" system backdrop (#15406)

Co-authored-by: Yair <[email protected]>
files-community · May 16, 2024 · ea18185 · ea18185
1 parent 42becc1
commit ea18185
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/src/Files.App/Data/Enums/BackdropMaterialType.cs b/src/Files.App/Data/Enums/BackdropMaterialType.cs
@@ -26,6 +26,11 @@ public enum BackdropMaterialType
  /// <summary>
  /// Arcylic backdrop.
  /// </summary>
- Acrylic
+ Acrylic,
+
+ /// <summary>
+ /// Thin Acrylic backdrop.
+ /// </summary>
+ ThinAcrylic
  }
 }
diff --git a/src/Files.App/Helpers/UI/AppSystemBackdrop.cs b/src/Files.App/Helpers/UI/AppSystemBackdrop.cs
@@ -2,12 +2,7 @@
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Windows.UI;
 
 namespace Files.App.Helpers
@@ -47,11 +42,11 @@ protected override void OnDefaultSystemBackdropConfigurationChanged(IComposition
  {
  base.OnDefaultSystemBackdropConfigurationChanged(target, xamlRoot);
  var configuration = GetDefaultSystemBackdropConfiguration(target, xamlRoot);
- if (controller is not DesktopAcrylicController acrylicController || configuration.Theme == prevTheme)
+ if (controller is not DesktopAcrylicController acrylicController || acrylicController.Kind != DesktopAcrylicKind.Thin || configuration.Theme == prevTheme)
  return;
 
  prevTheme = configuration.Theme;
- SetAcrylicBackdropProperties(acrylicController, configuration.Theme);
+ SetThinAcrylicBackdropProperties(acrylicController, configuration.Theme);
  }
 
  protected override void OnTargetDisconnected(ICompositionSupportsSystemBackdrop disconnectedTarget)
@@ -103,18 +98,27 @@ private void OnSettingChanged(object? sender, SettingChangedEventArgs e)
  };
 
  case BackdropMaterialType.Acrylic:
- var acrylicController = new DesktopAcrylicController();
- SetAcrylicBackdropProperties(acrylicController, theme);
+ return new DesktopAcrylicController()
+ {
+ Kind = DesktopAcrylicKind.Base,
+ };
+
+ case BackdropMaterialType.ThinAcrylic:
+ var acrylicController = new DesktopAcrylicController()
+ {
+ Kind = DesktopAcrylicKind.Thin
+ };
+ SetThinAcrylicBackdropProperties(acrylicController, theme);
  return acrylicController;
 
  default:
  return null;
  }
  }
 
- private void SetAcrylicBackdropProperties(DesktopAcrylicController controller, SystemBackdropTheme theme)
+ private void SetThinAcrylicBackdropProperties(DesktopAcrylicController controller, SystemBackdropTheme theme)
  {
- // This sets all properties to work around a bug where other properties stop updating when fallback color is changed
+ // This sets all properties to work around other properties not updating when fallback color is changed
  // This uses the Thin Acrylic recipe from the WinUI Figma toolkit
 
  switch(theme)

diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -3796,6 +3796,10 @@
  <data name="VerticalAlignment" xml:space="preserve">
  <value>Vertical alignment</value>
  </data>
+ <data name="ThinAcrylic" xml:space="preserve">
+ <value>Thin Acrylic</value>
+ <comment>This is a type of backdrop for the application background</comment>
+ </data>
  <data name="AllLocations" xml:space="preserve">
  <value>Show for all locations</value>
  <comment>Setting where users can choose to display "Open IDE" button for Git Repos</comment>

diff --git a/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs b/src/Files.App/ViewModels/Settings/AppearanceViewModel.cs
@@ -44,12 +44,10 @@ public AppearanceViewModel(IUserSettingsService userSettingsService, IResourcesS
  "DarkTheme".GetLocalizedResource()
  ];
 
- // TODO: Re-add Solid and regular Mica when theming is revamped
- //BackdropMaterialTypes.Add(BackdropMaterialType.Solid, "Solid".GetLocalizedResource());
-
+ BackdropMaterialTypes.Add(BackdropMaterialType.Solid, "None".GetLocalizedResource());
  BackdropMaterialTypes.Add(BackdropMaterialType.Acrylic, "Acrylic".GetLocalizedResource());
-
- //BackdropMaterialTypes.Add(BackdropMaterialType.Mica, "Mica".GetLocalizedResource());
+ BackdropMaterialTypes.Add(BackdropMaterialType.ThinAcrylic, "ThinAcrylic".GetLocalizedResource());
+ BackdropMaterialTypes.Add(BackdropMaterialType.Mica, "Mica".GetLocalizedResource());
  BackdropMaterialTypes.Add(BackdropMaterialType.MicaAlt, "MicaAlt".GetLocalizedResource());
 
  selectedBackdropMaterial = BackdropMaterialTypes[UserSettingsService.AppearanceSettingsService.AppThemeBackdropMaterial];