Skip to content

Commit 98cd803

Browse files
authored
Fix: Fixed icon not showing in stable and preview builds (#11188)
1 parent 5af7b11 commit 98cd803

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/Files.App/App.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public partial class App : Application
7676
public static SecondaryTileHelper SecondaryTileHelper { get; private set; } = new SecondaryTileHelper();
7777

7878
public static string AppVersion = $"{Package.Current.Id.Version.Major}.{Package.Current.Id.Version.Minor}.{Package.Current.Id.Version.Build}.{Package.Current.Id.Version.Revision}";
79-
79+
public static string LogoPath;
80+
8081
public IServiceProvider Services { get; private set; }
8182

8283
/// <summary>
@@ -93,6 +94,8 @@ public App()
9394
InitializeComponent();
9495
Services = ConfigureServices();
9596
Ioc.Default.ConfigureServices(Services);
97+
LogoPath = Package.Current.DisplayName == "Files - Dev" ? Constants.AssetPaths.DevLogo
98+
: (Package.Current.DisplayName == "Files - Preview" ? Constants.AssetPaths.PreviewLogo : Constants.AssetPaths.StableLogo);
9699
}
97100

98101
private IServiceProvider ConfigureServices()

src/Files.App/Constants.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public static class WslIconsPaths
7676

7777
public static class AssetPaths
7878
{
79-
public const string Logo = "Assets/AppTiles/Dev/Logo.ico";
79+
public const string DevLogo = "Assets/AppTiles/Dev/Logo.ico";
80+
public const string PreviewLogo = "Assets/AppTiles/Preview/Logo.ico";
81+
public const string StableLogo = "Assets/AppTiles/Release/Logo.ico";
8082
}
8183

8284
public static class UI

src/Files.App/Helpers/FilePropertiesHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ void Navigate(Frame frame)
123123
}
124124

125125
private static string GetFilesLogoPath()
126-
=> Path.Combine(Package.Current.InstalledLocation.Path, Constants.AssetPaths.Logo);
126+
=> Path.Combine(Package.Current.InstalledLocation.Path, App.LogoPath);
127127
}
128128
}

src/Files.App/MainWindow.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ private void EnsureEarlyWindow()
4646
// Set title
4747
AppWindow.Title = "Files";
4848

49-
// Set icon
50-
AppWindow.SetIcon(Path.Combine(Package.Current.InstalledLocation.Path, Constants.AssetPaths.Logo));
49+
// Set logo
50+
AppWindow.SetIcon(Path.Combine(Package.Current.InstalledLocation.Path, App.LogoPath));
5151

5252
// Extend title bar
5353
AppWindow.TitleBar.ExtendsContentIntoTitleBar = true;

0 commit comments

Comments
 (0)