Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Fixed issue where the Properties window had the wrong icon #14470

Merged
merged 6 commits into from
Jan 29, 2024
Merged

Fix: Fixed issue where the Properties window had the wrong icon #14470

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eac34cf
Fixed an issue where the window icon was not shown
0x5bfa Jan 16, 2024
a8e3c51
Merge branch 'main' into 5bfa/Fix-PropsWindowIconNotShown
0x5bfa Jan 19, 2024
b7f6013
Deleted ApplicationService class
0x5bfa Jan 22, 2024
ae2ab81
Merge branch '5bfa/Fix-PropsWindowIconNotShown' of https://github.com…
0x5bfa Jan 22, 2024
ab94474
Merge branch 'main' into 5bfa/Fix-PropsWindowIconNotShown
0x5bfa Jan 22, 2024
8fd73f4
Make the app icon path absolute path
0x5bfa Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.UI.Xaml.Media.Animation;
using Microsoft.Windows.ApplicationModel.Resources;
using System.Collections.Concurrent;
using Windows.ApplicationModel;
using Windows.Graphics;

namespace Files.App.Utils.Storage
Expand Down Expand Up @@ -120,7 +121,14 @@ public static void OpenPropertiesWindow(object item, IShellPage associatedInstan
appWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
appWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;

appWindow.SetIcon(applicationService.AppIcoPath);
string appIcoPath = ApplicationService.AppEnvironment switch
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
{
AppEnvironment.Dev => Constants.AssetPaths.DevLogo,
AppEnvironment.Preview => Constants.AssetPaths.PreviewLogo,
_ => Constants.AssetPaths.StableLogo
};

appWindow.SetIcon(SystemIO.Path.Combine(Package.Current.InstalledLocation.Path, appIcoPath));

frame.Navigate(
typeof(Views.Properties.MainPropertiesPage),
Expand Down