Skip to content

Feature: Enabled support for inputting custom icon path #16318

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

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Feature: Enabled support for inputting custom icon path #16318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e813da0
Feature: Allow inputting path for custom icon dll
yaira2 Oct 7, 2024
3b6bdc3
Update CustomizationViewModel.cs
yaira2 Oct 7, 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
44 changes: 20 additions & 24 deletions src/Files.App/ViewModels/Properties/CustomizationViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
using CommunityToolkit.WinUI;
using Files.App.Utils.Shell;
using Microsoft.UI.Windowing;
using System.IO;
using Windows.Storage.Pickers;
using Microsoft.UI.Windowing;
using System.Windows.Input;

namespace Files.App.ViewModels.Properties
Expand All @@ -24,13 +21,29 @@ private static string DefaultIconDllFilePath

public readonly bool IsShortcut;

public ObservableCollection<IconFileInfo> DllIcons { get; }
public ObservableCollection<IconFileInfo> DllIcons { get; } = [];

private string _IconResourceItemPath;
public string IconResourceItemPath
{
get => _IconResourceItemPath;
set => SetProperty(ref _IconResourceItemPath, value);
set
{
if (SetProperty(ref _IconResourceItemPath, value))
{
DllIcons.Clear();

if (Path.Exists(_IconResourceItemPath))
{
var icons = Win32Helper.ExtractIconsFromDLL(_IconResourceItemPath);
if (icons?.Count is null or 0)
return;

foreach (var item in icons)
DllIcons.Add(item);
}
}
}
}

private IconFileInfo? _SelectedDllIcon;
Expand Down Expand Up @@ -64,10 +77,6 @@ public CustomizationViewModel(IShellPage appInstance, BaseProperties basePropert
IsShortcut = item.IsShortcut;
_selectedItemPath = item.ItemPath;

DllIcons = [];

// Get default
LoadIconsForPath(IconResourceItemPath);

RestoreDefaultIconCommand = new RelayCommand(ExecuteRestoreDefaultIconCommand);
OpenFilePickerCommand = new RelayCommand(ExecuteOpenFilePickerCommand);
Expand All @@ -93,7 +102,7 @@ private void ExecuteOpenFilePickerCommand()

var result = CommonDialogService.Open_FileOpenDialog(hWnd, false, extensions, Environment.SpecialFolder.MyComputer, out var filePath);
if (result)
LoadIconsForPath(filePath);
IconResourceItemPath = filePath;
}

public async Task<bool> UpdateIcon()
Expand Down Expand Up @@ -126,18 +135,5 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>

return true;
}

private void LoadIconsForPath(string path)
{
IconResourceItemPath = path;
DllIcons.Clear();

var icons = Win32Helper.ExtractIconsFromDLL(path);
if (icons?.Count is null or 0)
return;

foreach(var item in icons)
DllIcons.Add(item);
}
}
}
5 changes: 1 addition & 4 deletions src/Files.App/Views/Properties/CustomizationPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<TextBox
x:Name="PickedDllFilePathTextBox"
IsReadOnly="True"
Text="{x:Bind CustomizationViewModel.IconResourceItemPath, Mode=OneWay}" />
<TextBox x:Name="PickedDllFilePathTextBox" Text="{x:Bind CustomizationViewModel.IconResourceItemPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<Button
x:Name="PickDllFileButton"
Expand Down
Loading