Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 01:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ImageResizer]Fix: Deleting an Image Resizer preset deletes the wrong preset (#38476)

Browse Source 
* [ImageResizer]Fix: Deleting an Image Resizer preset deletes the wrong preset

* update the helper

* sort items
This commit is contained in:
leileizhang
2025-04-23 09:35:40 +08:00
committed by GitHub
parent 232e1b79bd
commit e8b02cd797
5 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/imageresizer/ui/Models/ResizeSize.cs
View File

@@ -11,10 +11,11 @@ using System.Text.Json.Serialization;
using ImageResizer.Helpers;
using ImageResizer.Properties;
using ManagedCommon;
namespace ImageResizer.Models
{
public class ResizeSize : Observable
public class ResizeSize : Observable, IHasId
{
private static readonly Dictionary<string, string> _tokens = new Dictionary<string, string>
{
@@ -24,6 +25,7 @@ namespace ImageResizer.Models
["$phone$"] = Resources.Phone,
};
private int _id;
private string _name;
private ResizeFit _fit = ResizeFit.Fit;
private double _width;
@@ -31,8 +33,9 @@ namespace ImageResizer.Models
private bool _showHeight = true;
private ResizeUnit _unit = ResizeUnit.Pixel;
public ResizeSize(string name, ResizeFit fit, double width, double height, ResizeUnit unit)
public ResizeSize(int id, string name, ResizeFit fit, double width, double height, ResizeUnit unit)
{
Id = id;
Name = name;
Fit = fit;
Width = width;
@@ -44,6 +47,13 @@ namespace ImageResizer.Models
{
}
[JsonPropertyName("Id")]
public int Id
{
get => _id;
set => Set(ref _id, value);
}
[JsonPropertyName("name")]
public virtual string Name
{

12
src/modules/imageresizer/ui/Properties/Settings.cs
View File

@@ -19,6 +19,7 @@ using System.Threading;
using System.Windows.Media.Imaging;
using ImageResizer.Models;
using ManagedCommon;
namespace ImageResizer.Properties
{
@@ -63,10 +64,10 @@ namespace ImageResizer.Properties
FileName = "%1 (%2)";
Sizes = new ObservableCollection<ResizeSize>
{
new ResizeSize("$small$", ResizeFit.Fit, 854, 480, ResizeUnit.Pixel),
new ResizeSize("$medium$", ResizeFit.Fit, 1366, 768, ResizeUnit.Pixel),
new ResizeSize("$large$", ResizeFit.Fit, 1920, 1080, ResizeUnit.Pixel),
new ResizeSize("$phone$", ResizeFit.Fit, 320, 568, ResizeUnit.Pixel),
new ResizeSize(0, "$small$", ResizeFit.Fit, 854, 480, ResizeUnit.Pixel),
new ResizeSize(1, "$medium$", ResizeFit.Fit, 1366, 768, ResizeUnit.Pixel),
new ResizeSize(2, "$large$", ResizeFit.Fit, 1920, 1080, ResizeUnit.Pixel),
new ResizeSize(3, "$phone$", ResizeFit.Fit, 320, 568, ResizeUnit.Pixel),
};
KeepDateModified = false;
FallbackEncoder = new System.Guid("19e4a5aa-5662-4fc5-a0c0-1758028e1057");
@@ -480,6 +481,9 @@ namespace ImageResizer.Properties
{
Sizes.Clear();
Sizes.AddRange(jsonSettings.Sizes);
// Ensure Ids are unique and handle missing Ids
IdRecoveryHelper.RecoverInvalidIds(Sizes);
}
});