Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
Edit pictures: width × height with aspect lock, in px, cm, mm or inches (#725)
KnifeLemon0084bbeb48db
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 2e42b067..91dc87d4 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -337,6 +337,13 @@"image_edit.count": "الصور: {0}","image_edit.hint": "اختر الحجم والتنسيق والتدوير لهذه الصور. يحتفظ Filee باختياراتك للمرة القادمة.","image_edit.convert": "تحويل",+ "image_edit.width": "العرض",+ "image_edit.height": "الارتفاع",+ "image_edit.unit": "الوحدة",+ "image_edit.unit.Pixels": "بكسل",+ "image_edit.unit.Centimetres": "سم",+ "image_edit.unit.Millimetres": "مم",+ "image_edit.unit.Inches": "بوصة","preset.grayscale": "تدرّج رمادي","preset.remove_background": "إزالة الخلفية","preset.trim_transparent": "قص الحواف الشفافة",diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.jsonindex 9ff6b6d6..3762c01e 100644--- a/src/Filee.App/Assets/i18n/de.json+++ b/src/Filee.App/Assets/i18n/de.json@@ -337,6 +337,13 @@"image_edit.count": "{0} Bilder","image_edit.hint": "Wähle Größe, Format und Drehung für diese Bilder. Filee merkt sich deine Wahl für das nächste Mal.","image_edit.convert": "Konvertieren",+ "image_edit.width": "Breite",+ "image_edit.height": "Höhe",+ "image_edit.unit": "Einheit",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "Zoll","preset.grayscale": "Graustufen","preset.remove_background": "Hintergrund entfernen","preset.trim_transparent": "Transparente Ränder abschneiden",diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.jsonindex 5d09bbf7..299f9249 100644--- a/src/Filee.App/Assets/i18n/en.json+++ b/src/Filee.App/Assets/i18n/en.json@@ -347,6 +347,13 @@"image_edit.count": "{0} pictures","image_edit.hint": "Choose the size, format and rotation of these pictures. Filee keeps your choices for next time.","image_edit.convert": "Convert",+ "image_edit.width": "Width",+ "image_edit.height": "Height",+ "image_edit.unit": "Unit",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "inches","preset.grayscale": "Grayscale","preset.remove_background": "Remove background","preset.trim_transparent": "Trim transparent borders",diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex 048ceac5..b90960f4 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -337,6 +337,13 @@"image_edit.count": "{0} imágenes","image_edit.hint": "Elige el tamaño, el formato y la rotación de estas imágenes. Filee recuerda tu elección para la próxima vez.","image_edit.convert": "Convertir",+ "image_edit.width": "Ancho",+ "image_edit.height": "Alto",+ "image_edit.unit": "Unidad",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "pulgadas","preset.grayscale": "Grises","preset.remove_background": "Quitar fondo","preset.trim_transparent": "Recortar bordes transparentes",diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 7b517140..a8042f08 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -347,6 +347,13 @@"image_edit.count": "{0} images","image_edit.hint": "Choisissez la taille, le format et la rotation de ces images. Filee garde vos choix pour la prochaine fois.","image_edit.convert": "Convertir",+ "image_edit.width": "Largeur",+ "image_edit.height": "Hauteur",+ "image_edit.unit": "Unité",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "pouces","preset.grayscale": "Niveaux de gris","preset.remove_background": "Détourer","preset.trim_transparent": "Rogner les bords transparents",diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex e44149bf..30c6c4b8 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -337,6 +337,13 @@"image_edit.count": "{0} इमेज","image_edit.hint": "इन इमेज का आकार, फ़ॉर्मेट और घुमाव चुनें। Filee अगली बार के लिए आपकी पसंद याद रखता है।","image_edit.convert": "कन्वर्ट करें",+ "image_edit.width": "चौड़ाई",+ "image_edit.height": "ऊँचाई",+ "image_edit.unit": "इकाई",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "इंच","preset.grayscale": "ग्रेस्केल","preset.remove_background": "बैकग्राउंड हटाएँ","preset.trim_transparent": "पारदर्शी किनारे काटें",diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex cc0d2b3e..5fcf01db 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -337,6 +337,13 @@"image_edit.count": "{0} 枚の画像","image_edit.hint": "この画像のサイズ、形式、回転を選んでください。選んだ内容は次回も使われます。","image_edit.convert": "変換",+ "image_edit.width": "幅",+ "image_edit.height": "高さ",+ "image_edit.unit": "単位",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "インチ","preset.grayscale": "グレースケール","preset.remove_background": "背景を削除","preset.trim_transparent": "透明な余白を切り取る",diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex d5f1e16e..7a69bc8d 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -347,6 +347,13 @@"image_edit.count": "이미지 {0}개","image_edit.hint": "이 이미지들의 크기, 형식, 회전을 고르세요. 고른 값은 다음에도 그대로 쓰여요.","image_edit.convert": "변환",+ "image_edit.width": "너비",+ "image_edit.height": "높이",+ "image_edit.unit": "단위",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "인치","preset.grayscale": "흑백","preset.remove_background": "배경 제거","preset.trim_transparent": "투명 여백 자르기",diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex 5e8926ee..2969d6c4 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -337,6 +337,13 @@"image_edit.count": "छविहरू: {0}","image_edit.hint": "यी छविहरूको आकार, ढाँचा र घुमाइ छान्नुहोस्। Filee ले अर्को पटकका लागि तपाईंको छनोट सम्झन्छ।","image_edit.convert": "रूपान्तरण गर्नुहोस्",+ "image_edit.width": "चौडाइ",+ "image_edit.height": "उचाइ",+ "image_edit.unit": "एकाइ",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "इन्च","preset.grayscale": "ग्रेस्केल","preset.remove_background": "पृष्ठभूमि हटाउनुहोस्","preset.trim_transparent": "पारदर्शी किनारा काट्नुहोस्",diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex 8f50edcc..32813c2a 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -347,6 +347,13 @@"image_edit.count": "Obrazy: {0}","image_edit.hint": "Wybierz rozmiar, format i obrót tych obrazów. Filee zapamięta wybór na następny raz.","image_edit.convert": "Konwertuj",+ "image_edit.width": "Szerokość",+ "image_edit.height": "Wysokość",+ "image_edit.unit": "Jednostka",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "cale","preset.grayscale": "Skala szarości","preset.remove_background": "Usuń tło","preset.trim_transparent": "Przytnij przezroczyste brzegi",diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex 9b96f02f..a6d2ff69 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -347,6 +347,13 @@"image_edit.count": "{0} imagens","image_edit.hint": "Escolha o tamanho, o formato e a rotação dessas imagens. O Filee guarda suas escolhas para a próxima vez.","image_edit.convert": "Converter",+ "image_edit.width": "Largura",+ "image_edit.height": "Altura",+ "image_edit.unit": "Unidade",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "polegadas","preset.grayscale": "Tons de cinza","preset.remove_background": "Remover fundo","preset.trim_transparent": "Cortar bordas transparentes",diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.jsonindex 41c27c75..f140131e 100644--- a/src/Filee.App/Assets/i18n/pt-PT.json+++ b/src/Filee.App/Assets/i18n/pt-PT.json@@ -347,6 +347,13 @@"image_edit.count": "{0} imagens","image_edit.hint": "Escolha o tamanho, o formato e a rotação destas imagens. O Filee guarda as suas escolhas para a próxima vez.","image_edit.convert": "Converter",+ "image_edit.width": "Largura",+ "image_edit.height": "Altura",+ "image_edit.unit": "Unidade",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "polegadas","preset.grayscale": "Escala de cinzentos","preset.remove_background": "Remover fundo","preset.trim_transparent": "Recortar margens transparentes",diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex e1a24eb7..59ea5e03 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -347,6 +347,13 @@"image_edit.count": "Изображений: {0}","image_edit.hint": "Выберите размер, формат и поворот для этих изображений. Filee запомнит выбор на следующий раз.","image_edit.convert": "Преобразовать",+ "image_edit.width": "Ширина",+ "image_edit.height": "Высота",+ "image_edit.unit": "Единицы",+ "image_edit.unit.Pixels": "пикс.",+ "image_edit.unit.Centimetres": "см",+ "image_edit.unit.Millimetres": "мм",+ "image_edit.unit.Inches": "дюймы","preset.grayscale": "Оттенки серого","preset.remove_background": "Убрать фон","preset.trim_transparent": "Обрезать прозрачные края",diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.jsonindex 536d044e..69cc8d14 100644--- a/src/Filee.App/Assets/i18n/th.json+++ b/src/Filee.App/Assets/i18n/th.json@@ -337,6 +337,13 @@"image_edit.count": "รูปภาพ {0} รูป","image_edit.hint": "เลือกขนาด รูปแบบ และการหมุนของรูปภาพเหล่านี้ Filee จะจำตัวเลือกไว้ใช้ครั้งหน้า","image_edit.convert": "แปลง",+ "image_edit.width": "ความกว้าง",+ "image_edit.height": "ความสูง",+ "image_edit.unit": "หน่วย",+ "image_edit.unit.Pixels": "พิกเซล",+ "image_edit.unit.Centimetres": "ซม.",+ "image_edit.unit.Millimetres": "มม.",+ "image_edit.unit.Inches": "นิ้ว","preset.grayscale": "ขาวดำ (เกรย์สเกล)","preset.remove_background": "ลบพื้นหลัง","preset.trim_transparent": "ตัดขอบโปร่งใส",diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.jsonindex 821b201e..8003a876 100644--- a/src/Filee.App/Assets/i18n/tr.json+++ b/src/Filee.App/Assets/i18n/tr.json@@ -337,6 +337,13 @@"image_edit.count": "{0} görsel","image_edit.hint": "Bu görsellerin boyutunu, biçimini ve yönünü seçin. Filee seçimlerinizi bir dahaki sefere hatırlar.","image_edit.convert": "Dönüştür",+ "image_edit.width": "Genişlik",+ "image_edit.height": "Yükseklik",+ "image_edit.unit": "Birim",+ "image_edit.unit.Pixels": "px",+ "image_edit.unit.Centimetres": "cm",+ "image_edit.unit.Millimetres": "mm",+ "image_edit.unit.Inches": "inç","preset.grayscale": "Gri tonlama","preset.remove_background": "Arka planı kaldır","preset.trim_transparent": "Saydam kenarları kırp",diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex 8d069c66..c0b03fa9 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -347,6 +347,13 @@"image_edit.count": "{0} 张图片","image_edit.hint": "为这些图片选择尺寸、格式和旋转。Filee 会记住你的选择,下次继续使用。","image_edit.convert": "转换",+ "image_edit.width": "宽度",+ "image_edit.height": "高度",+ "image_edit.unit": "单位",+ "image_edit.unit.Pixels": "像素",+ "image_edit.unit.Centimetres": "厘米",+ "image_edit.unit.Millimetres": "毫米",+ "image_edit.unit.Inches": "英寸","preset.grayscale": "灰度","preset.remove_background": "去除背景","preset.trim_transparent": "裁掉透明边框",diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex 5d555109..6c7e00eb 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -347,6 +347,13 @@"image_edit.count": "{0} 張圖片","image_edit.hint": "為這些圖片選擇尺寸、格式和旋轉。Filee 會記住你的選擇,下次繼續使用。","image_edit.convert": "轉換",+ "image_edit.width": "寬度",+ "image_edit.height": "高度",+ "image_edit.unit": "單位",+ "image_edit.unit.Pixels": "像素",+ "image_edit.unit.Centimetres": "公分",+ "image_edit.unit.Millimetres": "公釐",+ "image_edit.unit.Inches": "英吋","preset.grayscale": "灰階","preset.remove_background": "去除背景","preset.trim_transparent": "裁掉透明邊框",diff --git a/src/Filee.App/ViewModels/ImageEditViewModel.cs b/src/Filee.App/ViewModels/ImageEditViewModel.csindex d2b992d2..449b6252 100644--- a/src/Filee.App/ViewModels/ImageEditViewModel.cs+++ b/src/Filee.App/ViewModels/ImageEditViewModel.cs@@ -60,10 +60,21 @@ public sealed partial class ImageEditViewModel : ObservableObjectResizeModes = ImageEditTool.ResizeModes.Select(v => new Choice<ResizeMode>(v, loc[$"presets.resize.{v}"])).ToList();Rotations = Enum.GetValues<ImageRotation>().Select(v => new Choice<ImageRotation>(v, loc[$"presets.rotation.{v}"])).ToList();Flips = Enum.GetValues<ImageFlip>().Select(v => new Choice<ImageFlip>(v, loc[$"presets.flip.{v}"])).ToList();+ Units = Enum.GetValues<SizeUnit>().Select(v => new Choice<SizeUnit>(v, loc[$"image_edit.unit.{v}"])).ToList();var image = tool.Image;_target = Targets.FirstOrDefault(t => t.Value == tool.TargetFormat) ?? Targets[0];- _resize = ResizeModes.FirstOrDefault(r => r.Value == image.Resize) ?? ResizeModes[0];+ // A free width × height is stored as CustomSize with Resize None (as presets store it, #576).+ _resize = image.CustomSize is not null+ ? ResizeModes.First(r => r.Value == ResizeMode.Custom)+ : ResizeModes.FirstOrDefault(r => r.Value == image.Resize) ?? ResizeModes[0];+ // Until one is chosen: the shape kept, so a first try never squeezes a photo.+ var custom = image.CustomSize ?? new CustomImageSize { LockAspect = true };+ _unit = Units.FirstOrDefault(u => u.Value == custom.Unit) ?? Units[0];+ _dpi = Math.Clamp(custom.Dpi, CustomImageSize.MinDpi, CustomImageSize.MaxDpi);+ _customWidth = (decimal)CustomImageSize.FromPixels(custom.ClampedWidth, _unit.Value, _dpi);+ _customHeight = (decimal)CustomImageSize.FromPixels(custom.ClampedHeight, _unit.Value, _dpi);+ _lockAspect = custom.LockAspect;_rotation = Rotations.FirstOrDefault(r => r.Value == image.Rotation) ?? Rotations[0];_flip = Flips.FirstOrDefault(f => f.Value == image.Flip) ?? Flips[0];_resizePercent = image.ResizePercent;@@ -79,13 +90,14 @@ public sealed partial class ImageEditViewModel : ObservableObjectpublic IReadOnlyList<Choice<ResizeMode>> ResizeModes { get; }public IReadOnlyList<Choice<ImageRotation>> Rotations { get; }public IReadOnlyList<Choice<ImageFlip>> Flips { get; }+ public IReadOnlyList<Choice<SizeUnit>> Units { get; }[ObservableProperty][NotifyPropertyChangedFor(nameof(ShowQuality), nameof(SizeAfter))]private Choice<string> _target;[ObservableProperty]- [NotifyPropertyChangedFor(nameof(ShowPercent), nameof(ShowLongEdge), nameof(ShowWidth), nameof(SizeAfter))]+ [NotifyPropertyChangedFor(nameof(ShowPercent), nameof(ShowLongEdge), nameof(ShowWidth), nameof(ShowCustom), nameof(ShowDpi), nameof(SizeAfter))]private Choice<ResizeMode> _resize;[ObservableProperty]@@ -106,6 +118,30 @@ public sealed partial class ImageEditViewModel : ObservableObject[NotifyPropertyChangedFor(nameof(SizeAfter))]private int _width;+ /// <summary>With <see cref="ResizeMode.Custom"/>: the width, in <see cref="Unit"/>.</summary>+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(SizeAfter))]+ private decimal _customWidth;++ /// <summary>With <see cref="ResizeMode.Custom"/>: the height, in <see cref="Unit"/>.</summary>+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(SizeAfter))]+ private decimal _customHeight;++ /// <summary>With <see cref="ResizeMode.Custom"/>: fit inside the width × height instead of stretching to it.</summary>+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(SizeAfter))]+ private bool _lockAspect;++ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(ShowDpi), nameof(SizeFormat), nameof(SizeAfter))]+ private Choice<SizeUnit> _unit;++ /// <summary>The resolution a size in cm, mm or inches becomes pixels at; also written into the pictures.</summary>+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(SizeAfter))]+ private int _dpi;+[ObservableProperty] private bool _grayscale;[ObservableProperty] private int _quality;@@ -114,9 +150,31 @@ public sealed partial class ImageEditViewModel : ObservableObjectpartial void OnRotationChanged(Choice<ImageRotation>? oldValue, Choice<ImageRotation> newValue) => Choices.Restore(oldValue, newValue, v => Rotation = v);partial void OnFlipChanged(Choice<ImageFlip>? oldValue, Choice<ImageFlip> newValue) => Choices.Restore(oldValue, newValue, v => Flip = v);+ partial void OnUnitChanged(Choice<SizeUnit>? oldValue, Choice<SizeUnit> newValue)+ {+ if (Choices.Restore(oldValue, newValue, v => Unit = v) || oldValue is null || oldValue.Value == newValue.Value)+ return;+ // The same pixels shown in the new unit, so switching the unit never changes the size by itself.+ var dpi = Math.Clamp(Dpi, CustomImageSize.MinDpi, CustomImageSize.MaxDpi);+ CustomWidth = (decimal)CustomImageSize.FromPixels(CustomImageSize.ToPixels((double)CustomWidth, oldValue.Value, dpi), newValue.Value, dpi);+ CustomHeight = (decimal)CustomImageSize.FromPixels(CustomImageSize.ToPixels((double)CustomHeight, oldValue.Value, dpi), newValue.Value, dpi);+ }+public bool ShowPercent => Resize.Value == ResizeMode.Percent;public bool ShowLongEdge => Resize.Value == ResizeMode.LongEdge;public bool ShowWidth => Resize.Value == ResizeMode.Width;+ public bool ShowCustom => Resize.Value == ResizeMode.Custom;++ /// <summary>A size in cm, mm or inches needs a resolution to become pixels.</summary>+ public bool ShowDpi => ShowCustom && Unit.Value != SizeUnit.Pixels;++ /// <summary>The width and height boxes: whole pixels, one decimal for mm, two for cm and inches.</summary>+ public string SizeFormat => Unit.Value switch+ {+ SizeUnit.Pixels => "0",+ SizeUnit.Millimetres => "0.#",+ _ => "0.##",+ };/// <summary>/// JPG, WEBP, AVIF and HEIC; with "Same format", when one of the pictures is one of them (a PNG has no quality).@@ -150,8 +208,16 @@ public sealed partial class ImageEditViewModel : ObservableObjectreturn null;var options = Options();var (width, height) = options.Rotation is ImageRotation.Left90 or ImageRotation.Right90 ? (size.Height, size.Width) : size;- var scale = ImageEncoder.ResizeScale(width, height, options);- (width, height) = (Math.Max(1, (int)Math.Round(width * scale)), Math.Max(1, (int)Math.Round(height * scale)));+ if (options.CustomSize is { Width: > 0, Height: > 0, LockAspect: false } stretched)+ {+ // Stretched to exactly that size, not scaled.+ (width, height) = (stretched.ClampedWidth, stretched.ClampedHeight);+ }+ else+ {+ var scale = ImageEncoder.ResizeScale(width, height, options);+ (width, height) = (Math.Max(1, (int)Math.Round(width * scale)), Math.Max(1, (int)Math.Round(height * scale)));+ }var target = _targetFor(Pictures[0], Target.Value) is var chosen && chosen == BuiltInData.SameAsSource ? _sourceFormats[0] : chosen;var fit = Math.Min(1, ImageEncoder.MaxSide(target) / Math.Max(width, height));if (fit < 1)@@ -166,6 +232,27 @@ public sealed partial class ImageEditViewModel : ObservableObject{var image = _tool.Image.Clone();image.Resize = Resize.Value;+ image.CustomSize = null;+ image.MinShortEdge = null;+ if (Resize.Value == ResizeMode.Custom)+ {+ // Stored as presets store it, CustomSize with Resize None, so an older version reads the tool (#576).+ var dpi = Math.Clamp(Dpi, CustomImageSize.MinDpi, CustomImageSize.MaxDpi);+ int Side(decimal value) =>+ Math.Clamp(CustomImageSize.ToPixels((double)value, Unit.Value, dpi), CustomImageSize.MinSide, CustomImageSize.MaxSide);+ image.Resize = ResizeMode.None;+ image.CustomSize = new CustomImageSize+ {+ Width = Side(CustomWidth),+ Height = Side(CustomHeight),+ LockAspect = LockAspect,+ Unit = Unit.Value,+ Dpi = dpi,+ };+ // A printed size: the pictures say how large they are meant to be printed.+ if (Unit.Value != SizeUnit.Pixels)+ image.Dpi = dpi;+ }image.ResizePercent = Math.Clamp(ResizePercent, 1, 1000);image.LongEdge = Math.Clamp(LongEdge, 16, 20000);image.Width = Math.Clamp(Width, 16, 20000);diff --git a/src/Filee.App/Views/ImageEditWindow.axaml b/src/Filee.App/Views/ImageEditWindow.axamlindex 2dff47d1..6e9c38a1 100644--- a/src/Filee.App/Views/ImageEditWindow.axaml+++ b/src/Filee.App/Views/ImageEditWindow.axaml@@ -48,6 +48,35 @@<NumericUpDown Value="{Binding Width}" Minimum="16" Maximum="20000" Increment="100" FormatString="0" ShowButtonSpinner="False" AutomationProperties.Name="{DynamicResource presets.width}" /></StackPanel></Grid>+ <!-- Width × height (#725), in px, cm, mm or inches; a size in cm, mm or inches becomes pixels at the DPI. -->+ <StackPanel x:Name="CustomSize" Spacing="8" IsVisible="{Binding ShowCustom}">+ <Grid ColumnDefinitions="*,8,Auto,8,*,12,Auto">+ <StackPanel>+ <TextBlock Classes="label" Text="{DynamicResource image_edit.width}" />+ <NumericUpDown x:Name="CustomWidthBox" Value="{Binding CustomWidth}" Minimum="0.1" Maximum="16384" Increment="1" FormatString="{Binding SizeFormat}"+ ShowButtonSpinner="False" HorizontalContentAlignment="Center" AutomationProperties.Name="{DynamicResource image_edit.width}" />+ </StackPanel>+ <TextBlock Grid.Column="2" Text="×" VerticalAlignment="Bottom" Margin="0,0,0,8" />+ <StackPanel Grid.Column="4">+ <TextBlock Classes="label" Text="{DynamicResource image_edit.height}" />+ <NumericUpDown x:Name="CustomHeightBox" Value="{Binding CustomHeight}" Minimum="0.1" Maximum="16384" Increment="1" FormatString="{Binding SizeFormat}"+ ShowButtonSpinner="False" HorizontalContentAlignment="Center" AutomationProperties.Name="{DynamicResource image_edit.height}" />+ </StackPanel>+ <StackPanel Grid.Column="6">+ <TextBlock Classes="label" Text="{DynamicResource image_edit.unit}" />+ <ComboBox x:Name="UnitChoice" ItemsSource="{Binding Units}" SelectedItem="{Binding Unit}" MinWidth="110"+ AutomationProperties.Name="{DynamicResource image_edit.unit}" />+ </StackPanel>+ </Grid>+ <DockPanel>+ <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="8" IsVisible="{Binding ShowDpi}">+ <TextBlock Text="{DynamicResource presets.dpi}" VerticalAlignment="Center" />+ <NumericUpDown x:Name="DpiBox" Value="{Binding Dpi}" Minimum="1" Maximum="9600" Increment="10" FormatString="0" Width="90"+ ShowButtonSpinner="False" HorizontalContentAlignment="Center" AutomationProperties.Name="{DynamicResource presets.dpi}" />+ </StackPanel>+ <CheckBox x:Name="LockAspectBox" Content="{DynamicResource presets.lock_aspect}" IsChecked="{Binding LockAspect}" VerticalAlignment="Center" />+ </DockPanel>+ </StackPanel><!-- The first picture's size before and after. Each size stays "width × height" in Arabic too; the arrow and theirorder follow the reading direction. --><StackPanel x:Name="SizeChange" Orientation="Horizontal" Spacing="6" IsVisible="{Binding ShowSize}">@@ -77,7 +106,7 @@<Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource presets.quality}" /></StackPanel>- <CheckBox Content="{DynamicResource presets.grayscale}" IsChecked="{Binding Grayscale}" />+ <CheckBox x:Name="GrayscaleBox" Content="{DynamicResource presets.grayscale}" IsChecked="{Binding Grayscale}" /></StackPanel></DockPanel></Window>diff --git a/src/Filee.Core/Presets/ImageEditTool.cs b/src/Filee.Core/Presets/ImageEditTool.csindex 5814b8dc..fbb2d4f0 100644--- a/src/Filee.Core/Presets/ImageEditTool.cs+++ b/src/Filee.Core/Presets/ImageEditTool.cs@@ -20,10 +20,11 @@ public static class ImageEditToolpublic static readonly IReadOnlySet<string> LossyTargets = new HashSet<string> { "jpg", "webp", "avif", "heic" };/// <summary>- /// The resizes the window offers, named rather than every <see cref="ResizeMode"/>: a mode added later (a free- /// width × height, #593) needs fields of its own in the window before it can be offered there.+ /// The resizes the window offers, named rather than every <see cref="ResizeMode"/>: a mode added later needs fields+ /// of its own in the window before it can be offered there. <see cref="ResizeMode.Custom"/> is the free width ×+ /// height, in pixels, cm, mm or inches (#725)./// </summary>- public static readonly IReadOnlyList<ResizeMode> ResizeModes = [ResizeMode.None, ResizeMode.Percent, ResizeMode.LongEdge, ResizeMode.Width];+ public static readonly IReadOnlyList<ResizeMode> ResizeModes = [ResizeMode.None, ResizeMode.Percent, ResizeMode.LongEdge, ResizeMode.Width, ResizeMode.Custom];/// <summary>True when a <paramref name="sourceFormat"/> file is a picture the tool can open.</summary>public static bool CanEdit(string sourceFormat) =>@@ -78,6 +79,8 @@ public static class ImageEditToolkept.ResizePercent = image.ResizePercent;kept.LongEdge = image.LongEdge;kept.Width = image.Width;+ kept.CustomSize = image.Clone().CustomSize;+ kept.MinShortEdge = image.MinShortEdge;kept.Rotation = image.Rotation;kept.Flip = image.Flip;kept.Grayscale = image.Grayscale;diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.csindex b9fa4a06..ffe50ebf 100644--- a/src/Filee.Core/Presets/Preset.cs+++ b/src/Filee.Core/Presets/Preset.cs@@ -641,7 +641,7 @@ public sealed class ImageOptionscopy.IcoSizes = [.. IcoSizes];copy.HiddenAreas = HiddenAreas?.Select(area => area.Clone()).ToList();copy.CustomSize = CustomSize is { } size- ? new CustomImageSize { Width = size.Width, Height = size.Height, LockAspect = size.LockAspect }+ ? new CustomImageSize { Width = size.Width, Height = size.Height, LockAspect = size.LockAspect, Unit = size.Unit, Dpi = size.Dpi }: null;return copy;}@@ -671,6 +671,16 @@ public sealed class CustomImageSize/// </summary>public bool LockAspect { get; set; }+ /// <summary>+ /// The unit the Edit pictures window shows the size in (#725). <see cref="Width"/> and <see cref="Height"/> stay in+ /// pixels whatever it is; a size in cm, mm or inches was turned into pixels at <see cref="Dpi"/>.+ /// </summary>+ [JsonConverter(typeof(LenientEnumJsonConverter<SizeUnit>))]+ public SizeUnit Unit { get; set; }++ /// <summary>The resolution a size in cm, mm or inches is turned into pixels at, and written into the picture.</summary>+ public int Dpi { get; set; } = 300;+/// <summary><see cref="Width"/> within the editor's range, so a hand-edited 200000 cannot ask for a picture no/// machine can hold.</summary>[JsonIgnore]@@ -679,6 +689,38 @@ public sealed class CustomImageSize/// <summary><see cref="Height"/> within the editor's range (see <see cref="ClampedWidth"/>).</summary>[JsonIgnore]public int ClampedHeight => Math.Clamp(Height, MinSide, MaxSide);++ /// <summary>The resolutions a size in cm, mm or inches may be turned into pixels at.</summary>+ public const int MinDpi = 1, MaxDpi = 9600;++ /// <summary>How many <paramref name="unit"/> make an inch; 0 for pixels.</summary>+ public static double PerInch(SizeUnit unit) => unit switch+ {+ SizeUnit.Centimetres => 2.54,+ SizeUnit.Millimetres => 25.4,+ SizeUnit.Inches => 1,+ _ => 0,+ };++ /// <summary>A length of <paramref name="value"/> <paramref name="unit"/> in pixels at <paramref name="dpi"/>.</summary>+ public static int ToPixels(double value, SizeUnit unit, int dpi) =>+ (int)Math.Round(unit == SizeUnit.Pixels ? value : value / PerInch(unit) * dpi, MidpointRounding.AwayFromZero);++ /// <summary>+ /// <paramref name="pixels"/> in <paramref name="unit"/> at <paramref name="dpi"/>, rounded as the window shows it:+ /// two decimals for cm and inches, one for mm.+ /// </summary>+ public static double FromPixels(int pixels, SizeUnit unit, int dpi) =>+ unit == SizeUnit.Pixels ? pixels : Math.Round(pixels * PerInch(unit) / dpi, unit == SizeUnit.Millimetres ? 1 : 2);+}++/// <summary>The unit a <see cref="CustomImageSize"/> is entered in.</summary>+public enum SizeUnit+{+ Pixels,+ Centimetres,+ Millimetres,+ Inches,}/// <summary>Page size used when images are placed into a PDF.</summary>diff --git a/tests/Filee.App.Tests/ImageEditWindowTests.cs b/tests/Filee.App.Tests/ImageEditWindowTests.csindex 073b6943..edb7b15b 100644--- a/tests/Filee.App.Tests/ImageEditWindowTests.cs+++ b/tests/Filee.App.Tests/ImageEditWindowTests.cs@@ -105,9 +105,99 @@ public class ImageEditWindowTests[AvaloniaFact]public void The_window_offers_the_resizes_it_has_fields_for(){- // A resize mode added later (#593's free width × height) needs its fields here before it is offered.+ // A resize mode added later needs its fields here before it is offered: the free width × height has them (#725).WithWindow(["icon.png"], (_, vm, _) =>- Assert.Equal([ResizeMode.None, ResizeMode.Percent, ResizeMode.LongEdge, ResizeMode.Width], vm.ResizeModes.Select(r => r.Value)));+ Assert.Equal([ResizeMode.None, ResizeMode.Percent, ResizeMode.LongEdge, ResizeMode.Width, ResizeMode.Custom],+ vm.ResizeModes.Select(r => r.Value)));+ }++ public static TheoryData<string, bool> SizeLooks => new()+ {+ { "en", false }, { "en", true }, { "ko", false }, { "ar", false }, { "ru", false }, { "de", true }, { "th", false },+ };++ [AvaloniaTheory]+ [MemberData(nameof(SizeLooks))]+ public void The_width_and_height_render(string language, bool dark)+ {+ WithWindow(["passport.jpg"], (window, vm, _) =>+ {+ vm.Resize = vm.ResizeModes.Single(r => r.Value == ResizeMode.Custom);+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Centimetres);+ vm.CustomWidth = 3.5m;+ vm.CustomHeight = 4.5m;+ Pump();+ Assert.True(window.FindControl<NumericUpDown>("DpiBox")!.IsEffectivelyVisible);+ Assert.All(window.GetVisualDescendants().OfType<NumericUpDown>(), box => Assert.False(box.ShowButtonSpinner));+ Save(window, $"window-image-edit-size-{language}-{(dark ? "dark" : "light")}.png");+ }, language: language, dark: dark);+ }++ [AvaloniaFact]+ public void A_width_and_height_in_pixels_stretch_or_fit()+ {+ WithWindow(["icon.png"], (window, vm, starts) =>+ {+ vm.Resize = vm.ResizeModes.Single(r => r.Value == ResizeMode.Custom);+ Assert.True(vm.ShowCustom);+ Assert.False(vm.ShowDpi); // pixels need no resolution+ Assert.False(window.FindControl<NumericUpDown>("DpiBox")!.IsEffectivelyVisible);+ Assert.True(vm.LockAspect); // the shape is kept until the user says otherwise++ vm.CustomWidth = 100;+ vm.CustomHeight = 100;+ Assert.Equal("100 × 50", vm.SizeAfter); // 512 × 256 fitted inside+ vm.LockAspect = false;+ Assert.Equal("100 × 100", vm.SizeAfter); // stretched to exactly that++ vm.Convert();++ var image = Assert.Single(starts).Preset.Image;+ Assert.Equal(ResizeMode.None, image.Resize); // stored as presets store it, readable by an older version+ Assert.Equal((100, 100, false, SizeUnit.Pixels), (image.CustomSize!.Width, image.CustomSize.Height, image.CustomSize.LockAspect, image.CustomSize.Unit));+ Assert.Null(image.Dpi); // the source's resolution is kept+ });+ }++ [AvaloniaFact]+ public void A_printed_size_becomes_pixels_at_the_dpi_and_the_pictures_carry_it()+ {+ WithWindow(["icon.png"], (_, vm, starts) =>+ {+ vm.Resize = vm.ResizeModes.Single(r => r.Value == ResizeMode.Custom);+ vm.LockAspect = false;+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Centimetres);+ Assert.True(vm.ShowDpi);+ Assert.Equal(300, vm.Dpi);+ vm.CustomWidth = 3.5m; // a passport photo, 35 × 45 mm+ vm.CustomHeight = 4.5m;+ Assert.Equal("413 × 531", vm.SizeAfter);+ vm.Dpi = 600;+ Assert.Equal("827 × 1063", vm.SizeAfter);++ vm.Convert();++ var image = Assert.Single(starts).Preset.Image;+ Assert.Equal((827, 1063, SizeUnit.Centimetres, 600), (image.CustomSize!.Width, image.CustomSize.Height, image.CustomSize.Unit, image.CustomSize.Dpi));+ Assert.Equal(600, image.Dpi);+ });+ }++ [AvaloniaFact]+ public void Switching_the_unit_keeps_the_size()+ {+ WithWindow(["icon.png"], (_, vm, _) =>+ {+ vm.Resize = vm.ResizeModes.Single(r => r.Value == ResizeMode.Custom);+ vm.CustomWidth = 600;+ vm.CustomHeight = 300;+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Inches);+ Assert.Equal((2m, 1m, "0.##"), (vm.CustomWidth, vm.CustomHeight, vm.SizeFormat));+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Millimetres);+ Assert.Equal((50.8m, 25.4m, "0.#"), (vm.CustomWidth, vm.CustomHeight, vm.SizeFormat));+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Pixels);+ Assert.Equal((600m, 300m, "0"), (vm.CustomWidth, vm.CustomHeight, vm.SizeFormat));+ });}[AvaloniaFact]@@ -139,7 +229,7 @@ public class ImageEditWindowTests});WithWindow(["icon.png"], (window, _, starts) =>{- var grayscale = window.GetVisualDescendants().OfType<CheckBox>().Single();+ var grayscale = window.FindControl<CheckBox>("GrayscaleBox")!;grayscale.Focus();Press(window, Key.Enter);Assert.Single(starts);@@ -186,6 +276,7 @@ public class ImageEditWindowTestsvm.Convert();}, saved);Assert.Equal(("webp", ResizeMode.Width, 640), (saved.TargetFormat, saved.Image.Resize, saved.Image.Width));+ Assert.Null(saved.Image.CustomSize);// Opened again: as left.WithWindow(["icon.png"], (_, vm, _) =>@@ -193,6 +284,24 @@ public class ImageEditWindowTestsAssert.Equal("webp", vm.Target.Value);Assert.Equal((ResizeMode.Width, 640), (vm.Resize.Value, vm.Width));Assert.True(vm.ShowWidth);++ // A printed size is kept in its unit and at its resolution.+ vm.Resize = vm.ResizeModes.Single(r => r.Value == ResizeMode.Custom);+ vm.Unit = vm.Units.Single(u => u.Value == SizeUnit.Millimetres);+ vm.Dpi = 350;+ vm.CustomWidth = 35;+ vm.CustomHeight = 45;+ vm.LockAspect = false;+ vm.Convert();+ }, saved);+ Assert.Equal((ResizeMode.None, 482, 620, SizeUnit.Millimetres, 350),+ (saved.Image.Resize, saved.Image.CustomSize!.Width, saved.Image.CustomSize.Height, saved.Image.CustomSize.Unit, saved.Image.CustomSize.Dpi));+ Assert.Null(saved.Image.Dpi); // only the conversions write it; the tool keeps its own++ WithWindow(["icon.png"], (_, vm, _) =>+ {+ Assert.Equal((ResizeMode.Custom, SizeUnit.Millimetres, 350, 35m, 45m, false),+ (vm.Resize.Value, vm.Unit.Value, vm.Dpi, vm.CustomWidth, vm.CustomHeight, vm.LockAspect));}, saved);}finallydiff --git a/tests/Filee.Core.Tests/ImageEditToolTests.cs b/tests/Filee.Core.Tests/ImageEditToolTests.csindex be8841cf..a403dfae 100644--- a/tests/Filee.Core.Tests/ImageEditToolTests.cs+++ b/tests/Filee.Core.Tests/ImageEditToolTests.cs@@ -68,6 +68,39 @@ public class ImageEditToolTestsAssert.True(tool.IsImageEditTool);}+ [Fact]+ public void A_width_and_height_is_kept_in_the_tool_with_its_unit_and_survives_saving()+ {+ var tool = Tool();+ var image = tool.Image.Clone();+ image.CustomSize = new CustomImageSize { Width = 413, Height = 531, Unit = SizeUnit.Centimetres, Dpi = 300 };+ ImageEditTool.Remember(tool, "jpg", image);+ image.CustomSize.Width = 1; // the tool has its own copy++ Assert.Equal((413, SizeUnit.Centimetres, 300), (tool.Image.CustomSize!.Width, tool.Image.CustomSize.Unit, tool.Image.CustomSize.Dpi));+ var clone = tool.Image.Clone().CustomSize!;+ Assert.Equal((SizeUnit.Centimetres, 300), (clone.Unit, clone.Dpi));++ var json = JsonSerializer.Serialize(new List<Preset> { tool }, FileeJsonContext.Default.ListPreset);+ var read = JsonSerializer.Deserialize(json, FileeJsonContext.Default.ListPreset)!.Single().Image.CustomSize!;+ Assert.Equal((413, 531, SizeUnit.Centimetres, 300), (read.Width, read.Height, read.Unit, read.Dpi));++ // A unit a later version adds reads as pixels, instead of the whole presets file failing to read.+ var later = json.Replace("\"Centimetres\"", "\"Points\"", StringComparison.Ordinal);+ Assert.Equal(SizeUnit.Pixels, JsonSerializer.Deserialize(later, FileeJsonContext.Default.ListPreset)!.Single().Image.CustomSize!.Unit);+ }++ [Theory]+ [InlineData(3.5, SizeUnit.Centimetres, 300, 413)]+ [InlineData(45, SizeUnit.Millimetres, 300, 531)]+ [InlineData(2, SizeUnit.Inches, 300, 600)]+ [InlineData(640, SizeUnit.Pixels, 300, 640)]+ public void A_printed_size_is_turned_into_pixels_and_back(double value, SizeUnit unit, int dpi, int pixels)+ {+ Assert.Equal(pixels, CustomImageSize.ToPixels(value, unit, dpi));+ Assert.Equal(value, CustomImageSize.FromPixels(pixels, unit, dpi), 1);+ }+[Fact]public void A_picture_keeps_its_format_where_it_can_be_written_else_becomes_png(){