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
feat(crop): add a perspective mode that straightens a tilted picture
SeoJCalivecaa87e8dc588
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 15dc840f..3f6b3e6e 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -253,6 +253,14 @@"crop.state_done": "تم الاقتصاص","crop.state_skipped": "تم التخطي","crop.state_failed": "فشل",+ "crop.perspective": "المنظور",+ "crop.perspective_tip": "المنظور: حرّك كل زاوية على حدة لتقويم صورة مائلة",+ "crop.perspective_pdf": "يعمل المنظور على الصور فقط، لا على صفحات PDF",+ "crop.hint_keys_perspective": "يختار Tab زاوية، وتحرّكها مفاتيح الأسهم، ومع Shift تكون الخطوة أكبر بعشر مرات · Esc للإغلاق",+ "crop.corner_top_left": "الزاوية العلوية اليسرى",+ "crop.corner_top_right": "الزاوية العلوية اليمنى",+ "crop.corner_bottom_right": "الزاوية السفلية اليمنى",+ "crop.corner_bottom_left": "الزاوية السفلية اليسرى","preset.hide": "بكسلة / تمويه","preset.hide.donut": "بكسلة","error.cannot_hide": "البكسلة والتمويه متاحان للصور فقط",diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.jsonindex e611705a..5755d0ee 100644--- a/src/Filee.App/Assets/i18n/de.json+++ b/src/Filee.App/Assets/i18n/de.json@@ -253,6 +253,14 @@"crop.state_done": "Zugeschnitten","crop.state_skipped": "Übersprungen","crop.state_failed": "Fehlgeschlagen",+ "crop.perspective": "Perspektive",+ "crop.perspective_tip": "Perspektive: jede Ecke einzeln verschieben, um ein schräges Bild gerade zu ziehen",+ "crop.perspective_pdf": "Perspektive funktioniert bei Bildern, nicht bei PDF-Seiten",+ "crop.hint_keys_perspective": "Tab wählt eine Ecke, Pfeiltasten verschieben sie, Umschalt × 10 · Esc schließt",+ "crop.corner_top_left": "Ecke oben links",+ "crop.corner_top_right": "Ecke oben rechts",+ "crop.corner_bottom_right": "Ecke unten rechts",+ "crop.corner_bottom_left": "Ecke unten links","preset.hide": "Verpixeln / Weichzeichnen","preset.hide.donut": "Verpixeln","error.cannot_hide": "Verpixeln und Weichzeichnen ist nur bei Bildern möglich",diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.jsonindex 2a16fcb7..cadb814c 100644--- a/src/Filee.App/Assets/i18n/en.json+++ b/src/Filee.App/Assets/i18n/en.json@@ -262,6 +262,14 @@"crop.state_done": "Cropped","crop.state_skipped": "Skipped","crop.state_failed": "Failed",+ "crop.perspective": "Perspective",+ "crop.perspective_tip": "Perspective: move each corner on its own to straighten a slanted picture",+ "crop.perspective_pdf": "Perspective works on pictures, not on PDF pages",+ "crop.hint_keys_perspective": "Tab picks a corner, arrow keys move it, Shift × 10 · Esc closes",+ "crop.corner_top_left": "Top-left corner",+ "crop.corner_top_right": "Top-right corner",+ "crop.corner_bottom_right": "Bottom-right corner",+ "crop.corner_bottom_left": "Bottom-left corner","preset.hide": "Pixelate / blur","preset.hide.donut": "Pixelate","error.cannot_hide": "Only pictures can be pixelated or blurred",diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex b838f7ff..bed24f2b 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -253,6 +253,14 @@"crop.state_done": "Recortado","crop.state_skipped": "Omitido","crop.state_failed": "Error",+ "crop.perspective": "Perspectiva",+ "crop.perspective_tip": "Perspectiva: mueve cada esquina por separado para enderezar una imagen inclinada",+ "crop.perspective_pdf": "La perspectiva funciona con imágenes, no con páginas PDF",+ "crop.hint_keys_perspective": "Tab elige una esquina, las flechas la mueven, Mayús × 10 · Esc cierra",+ "crop.corner_top_left": "Esquina superior izquierda",+ "crop.corner_top_right": "Esquina superior derecha",+ "crop.corner_bottom_right": "Esquina inferior derecha",+ "crop.corner_bottom_left": "Esquina inferior izquierda","preset.hide": "Pixelar / difuminar","preset.hide.donut": "Pixelar","error.cannot_hide": "Solo se pueden pixelar o difuminar imágenes",diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 308664e5..8c6fa877 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -262,6 +262,14 @@"crop.state_done": "Recadré","crop.state_skipped": "Ignoré","crop.state_failed": "Échec",+ "crop.perspective": "Perspective",+ "crop.perspective_tip": "Perspective : déplacez chaque coin séparément pour redresser une image de biais",+ "crop.perspective_pdf": "La perspective fonctionne sur les images, pas sur les pages PDF",+ "crop.hint_keys_perspective": "Tab choisit un coin, les flèches le déplacent, Maj × 10 · Échap ferme",+ "crop.corner_top_left": "Coin supérieur gauche",+ "crop.corner_top_right": "Coin supérieur droit",+ "crop.corner_bottom_right": "Coin inférieur droit",+ "crop.corner_bottom_left": "Coin inférieur gauche","preset.hide": "Pixeliser / flouter","preset.hide.donut": "Pixeliser","error.cannot_hide": "Seules les images peuvent être pixelisées ou floutées",diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex 85213616..b106d37a 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -253,6 +253,14 @@"crop.state_done": "क्रॉप हो गया","crop.state_skipped": "छोड़ा गया","crop.state_failed": "विफल",+ "crop.perspective": "परिप्रेक्ष्य",+ "crop.perspective_tip": "परिप्रेक्ष्य: तिरछी तस्वीर सीधी करने के लिए हर कोना अलग से खिसकाएँ",+ "crop.perspective_pdf": "परिप्रेक्ष्य तस्वीरों पर काम करता है, PDF पन्नों पर नहीं",+ "crop.hint_keys_perspective": "Tab से कोना चुनें, ऐरो कुंजियाँ उसे खिसकाती हैं, Shift से 10 गुना · Esc से बंद करें",+ "crop.corner_top_left": "ऊपर बायाँ कोना",+ "crop.corner_top_right": "ऊपर दायाँ कोना",+ "crop.corner_bottom_right": "नीचे दायाँ कोना",+ "crop.corner_bottom_left": "नीचे बायाँ कोना","preset.hide": "पिक्सलेट / धुंधला","preset.hide.donut": "पिक्सलेट","error.cannot_hide": "पिक्सलेट और धुंधला केवल इमेज पर काम करता है",diff --git a/src/Filee.App/Assets/i18n/it.json b/src/Filee.App/Assets/i18n/it.jsonindex e62e8ea7..af5b4690 100644--- a/src/Filee.App/Assets/i18n/it.json+++ b/src/Filee.App/Assets/i18n/it.json@@ -253,6 +253,14 @@"crop.state_done": "Ritagliato","crop.state_skipped": "Saltato","crop.state_failed": "Non riuscito",+"crop.perspective": "Prospettiva",+"crop.perspective_tip": "Prospettiva: sposta ogni angolo da solo per raddrizzare un'immagine inclinata",+"crop.perspective_pdf": "La prospettiva funziona sulle immagini, non sulle pagine PDF",+"crop.hint_keys_perspective": "Tab sceglie un angolo, i tasti freccia lo spostano, Maiusc × 10 · Esc chiude",+"crop.corner_top_left": "Angolo in alto a sinistra",+"crop.corner_top_right": "Angolo in alto a destra",+"crop.corner_bottom_right": "Angolo in basso a destra",+"crop.corner_bottom_left": "Angolo in basso a sinistra","preset.hide": "Pixella / sfoca","preset.hide.donut": "Pixella","error.cannot_hide": "Solo le immagini possono essere pixellate o sfocate",diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex b007d5fe..89ca0d7a 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -253,6 +253,14 @@"crop.state_done": "トリミング済み","crop.state_skipped": "スキップ","crop.state_failed": "失敗",+ "crop.perspective": "遠近補正",+ "crop.perspective_tip": "遠近補正:角を 1 つずつ動かして、斜めに写った画像をまっすぐにする",+ "crop.perspective_pdf": "遠近補正は画像に使えます。PDF のページには使えません",+ "crop.hint_keys_perspective": "Tab で角を選択、矢印キーで移動、Shift で 10 倍 · Esc で閉じる",+ "crop.corner_top_left": "左上の角",+ "crop.corner_top_right": "右上の角",+ "crop.corner_bottom_right": "右下の角",+ "crop.corner_bottom_left": "左下の角","preset.hide": "モザイク・ぼかし","preset.hide.donut": "モザイク","error.cannot_hide": "モザイクとぼかしは画像でのみ使えます",diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex 04f70f33..c981eb91 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -262,6 +262,14 @@"crop.state_done": "자르기 완료","crop.state_skipped": "건너뜀","crop.state_failed": "실패",+ "crop.perspective": "원근",+ "crop.perspective_tip": "원근: 모서리를 하나씩 옮겨 비스듬한 사진을 반듯하게 펴기",+ "crop.perspective_pdf": "원근은 그림에만 쓸 수 있고 PDF 쪽에는 쓸 수 없어요",+ "crop.hint_keys_perspective": "Tab으로 모서리 고르기, 화살표 키로 이동, Shift는 10배 · Esc로 닫기",+ "crop.corner_top_left": "왼쪽 위 모서리",+ "crop.corner_top_right": "오른쪽 위 모서리",+ "crop.corner_bottom_right": "오른쪽 아래 모서리",+ "crop.corner_bottom_left": "왼쪽 아래 모서리","preset.hide": "모자이크·흐림","preset.hide.donut": "모자이크","error.cannot_hide": "모자이크와 흐림은 이미지에만 할 수 있어요",diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex 45fed94e..f728b81c 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -253,6 +253,14 @@"crop.state_done": "क्रप गरियो","crop.state_skipped": "छोडियो","crop.state_failed": "असफल भयो",+ "crop.perspective": "परिप्रेक्ष्य",+ "crop.perspective_tip": "परिप्रेक्ष्य: छड्के तस्बिर सीधा बनाउन हरेक कुना छुट्टाछुट्टै सार्नुहोस्",+ "crop.perspective_pdf": "परिप्रेक्ष्य तस्बिरमा मात्र चल्छ, PDF पानामा चल्दैन",+ "crop.hint_keys_perspective": "Tab ले कुना छान्छ, एरो कीहरूले सार्छन्, Shift थिच्दा १० गुणा · Esc ले बन्द गर्छ",+ "crop.corner_top_left": "माथिल्लो बायाँ कुना",+ "crop.corner_top_right": "माथिल्लो दायाँ कुना",+ "crop.corner_bottom_right": "तल्लो दायाँ कुना",+ "crop.corner_bottom_left": "तल्लो बायाँ कुना","preset.hide": "पिक्सलेट / धमिलो","preset.hide.donut": "पिक्सलेट","error.cannot_hide": "पिक्सलेट र धमिलो पार्ने कार्य केवल छविहरूमा मात्र काम गर्छ",diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex f9d8bc5b..9ea16c30 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -262,6 +262,14 @@"crop.state_done": "Wykadrowany","crop.state_skipped": "Pominięty","crop.state_failed": "Błąd",+ "crop.perspective": "Perspektywa",+ "crop.perspective_tip": "Perspektywa: przesuwaj każdy róg osobno, by wyprostować przekrzywione zdjęcie",+ "crop.perspective_pdf": "Perspektywa działa na obrazach, nie na stronach PDF",+ "crop.hint_keys_perspective": "Tab wybiera róg, strzałki go przesuwają, Shift × 10 · Esc zamyka",+ "crop.corner_top_left": "Lewy górny róg",+ "crop.corner_top_right": "Prawy górny róg",+ "crop.corner_bottom_right": "Prawy dolny róg",+ "crop.corner_bottom_left": "Lewy dolny róg","preset.hide": "Pikselizacja / rozmycie","preset.hide.donut": "Mozaika","error.cannot_hide": "Pikselizować i rozmywać można tylko obrazy",diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex d7bd76a8..e327748a 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -263,6 +263,14 @@"crop.state_done": "Recortado","crop.state_skipped": "Pulado","crop.state_failed": "Falhou",+ "crop.perspective": "Perspectiva",+ "crop.perspective_tip": "Perspectiva: mova cada canto separadamente para endireitar uma imagem inclinada",+ "crop.perspective_pdf": "A perspectiva funciona em imagens, não em páginas PDF",+ "crop.hint_keys_perspective": "Tab escolhe um canto, as setas o movem, Shift × 10 · Esc fecha",+ "crop.corner_top_left": "Canto superior esquerdo",+ "crop.corner_top_right": "Canto superior direito",+ "crop.corner_bottom_right": "Canto inferior direito",+ "crop.corner_bottom_left": "Canto inferior esquerdo","preset.hide": "Pixelizar / desfocar","preset.hide.donut": "Pixelizar","error.cannot_hide": "Só é possível pixelizar ou desfocar imagens",diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.jsonindex b50fd59f..d50366cf 100644--- a/src/Filee.App/Assets/i18n/pt-PT.json+++ b/src/Filee.App/Assets/i18n/pt-PT.json@@ -262,6 +262,14 @@"crop.state_done": "Recortado","crop.state_skipped": "Ignorado","crop.state_failed": "Falhou",+ "crop.perspective": "Perspetiva",+ "crop.perspective_tip": "Perspetiva: mova cada canto separadamente para endireitar uma imagem inclinada",+ "crop.perspective_pdf": "A perspetiva funciona em imagens, não em páginas PDF",+ "crop.hint_keys_perspective": "A tecla Tab escolhe um canto e as teclas de direção movem-no; Shift multiplica o movimento por 10 · Esc fecha",+ "crop.corner_top_left": "Canto superior esquerdo",+ "crop.corner_top_right": "Canto superior direito",+ "crop.corner_bottom_right": "Canto inferior direito",+ "crop.corner_bottom_left": "Canto inferior esquerdo","preset.hide": "Pixelizar / desfocar","preset.hide.donut": "Pixelizar","error.cannot_hide": "Só é possível pixelizar ou desfocar imagens",diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex 6f1ce9ad..00dc7454 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -262,6 +262,14 @@"crop.state_done": "Обрезан","crop.state_skipped": "Пропущен","crop.state_failed": "Ошибка",+ "crop.perspective": "Перспектива",+ "crop.perspective_tip": "Перспектива: двигайте каждый угол отдельно, чтобы выпрямить снятое под углом изображение",+ "crop.perspective_pdf": "Перспектива работает с изображениями, но не со страницами PDF",+ "crop.hint_keys_perspective": "Tab выбирает угол, стрелки двигают его, Shift × 10 · Esc закрывает",+ "crop.corner_top_left": "Левый верхний угол",+ "crop.corner_top_right": "Правый верхний угол",+ "crop.corner_bottom_right": "Правый нижний угол",+ "crop.corner_bottom_left": "Левый нижний угол","preset.hide": "Пикселизация / размытие","preset.hide.donut": "Мозаика","error.cannot_hide": "Пикселизировать и размывать можно только изображения",diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.jsonindex c047d176..6bd724f0 100644--- a/src/Filee.App/Assets/i18n/th.json+++ b/src/Filee.App/Assets/i18n/th.json@@ -253,6 +253,14 @@"crop.state_done": "ครอบตัดแล้ว","crop.state_skipped": "ข้ามแล้ว","crop.state_failed": "ล้มเหลว",+ "crop.perspective": "มุมมองเปอร์สเปกทีฟ",+ "crop.perspective_tip": "มุมมองเปอร์สเปกทีฟ: เลื่อนแต่ละมุมแยกกันเพื่อดัดภาพที่เอียงให้ตรง",+ "crop.perspective_pdf": "มุมมองเปอร์สเปกทีฟใช้ได้กับรูปภาพ ใช้กับหน้า PDF ไม่ได้",+ "crop.hint_keys_perspective": "Tab เพื่อเลือกมุม, ปุ่มลูกศรเพื่อเลื่อน, Shift × 10 · Esc เพื่อปิด",+ "crop.corner_top_left": "มุมบนซ้าย",+ "crop.corner_top_right": "มุมบนขวา",+ "crop.corner_bottom_right": "มุมล่างขวา",+ "crop.corner_bottom_left": "มุมล่างซ้าย","preset.hide": "โมเสก / เบลอ","preset.hide.donut": "โมเสก","error.cannot_hide": "ใส่โมเสกหรือเบลอได้เฉพาะไฟล์รูปภาพเท่านั้น",diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.jsonindex 0b195c35..92ee1139 100644--- a/src/Filee.App/Assets/i18n/tr.json+++ b/src/Filee.App/Assets/i18n/tr.json@@ -253,6 +253,14 @@"crop.state_done": "Kırpıldı","crop.state_skipped": "Atlandı","crop.state_failed": "Başarısız",+ "crop.perspective": "Perspektif",+ "crop.perspective_tip": "Perspektif: eğik bir resmi düzeltmek için her köşeyi ayrı ayrı taşıyın",+ "crop.perspective_pdf": "Perspektif resimlerde çalışır, PDF sayfalarında çalışmaz",+ "crop.hint_keys_perspective": "Tab bir köşe seçer, ok tuşları onu taşır, Shift × 10 · Esc kapatır",+ "crop.corner_top_left": "Sol üst köşe",+ "crop.corner_top_right": "Sağ üst köşe",+ "crop.corner_bottom_right": "Sağ alt köşe",+ "crop.corner_bottom_left": "Sol alt köşe","preset.hide": "Pikselleştir / bulanıklaştır","preset.hide.donut": "Mozaik","error.cannot_hide": "Yalnızca görseller pikselleştirilebilir veya bulanıklaştırılabilir",diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex a048a323..c76a842d 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -262,6 +262,14 @@"crop.state_done": "已裁剪","crop.state_skipped": "已跳过","crop.state_failed": "失败",+ "crop.perspective": "透视",+ "crop.perspective_tip": "透视:分别移动每个角,把倾斜的图片拉正",+ "crop.perspective_pdf": "透视仅适用于图片,不适用于 PDF 页面",+ "crop.hint_keys_perspective": "Tab 选择角,方向键移动,Shift 为 10 倍 · Esc 关闭",+ "crop.corner_top_left": "左上角",+ "crop.corner_top_right": "右上角",+ "crop.corner_bottom_right": "右下角",+ "crop.corner_bottom_left": "左下角","preset.hide": "马赛克/模糊","preset.hide.donut": "马赛克","error.cannot_hide": "只能对图片打马赛克或模糊",diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex 51c831d8..db5bb5db 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -262,6 +262,14 @@"crop.state_done": "已裁剪","crop.state_skipped": "已跳過","crop.state_failed": "失敗",+ "crop.perspective": "透視",+ "crop.perspective_tip": "透視:分別移動每個角,把傾斜的圖片拉正",+ "crop.perspective_pdf": "透視僅適用於圖片,不適用於 PDF 頁面",+ "crop.hint_keys_perspective": "Tab 選擇角,方向鍵移動,Shift 為 10 倍 · Esc 關閉",+ "crop.corner_top_left": "左上角",+ "crop.corner_top_right": "右上角",+ "crop.corner_bottom_right": "右下角",+ "crop.corner_bottom_left": "左下角","preset.hide": "馬賽克/模糊","preset.hide.donut": "馬賽克","error.cannot_hide": "只能對圖片加上馬賽克或模糊",diff --git a/src/Filee.App/Controls/CropCanvas.cs b/src/Filee.App/Controls/CropCanvas.csindex 3b0f358b..056d639f 100644--- a/src/Filee.App/Controls/CropCanvas.cs+++ b/src/Filee.App/Controls/CropCanvas.cs@@ -41,6 +41,15 @@ public sealed class CropCanvas : Controlpublic static readonly StyledProperty<double> AspectRatioProperty =AvaloniaProperty.Register<CropCanvas, double>(nameof(AspectRatio), 0);+ public static readonly StyledProperty<bool> IsPerspectiveProperty =+ AvaloniaProperty.Register<CropCanvas, bool>(nameof(IsPerspective));++ public static readonly StyledProperty<CropQuad> NormalizedCornersProperty =+ AvaloniaProperty.Register<CropCanvas, CropQuad>(nameof(NormalizedCorners), CropQuad.Full);++ public static readonly StyledProperty<int> SelectedCornerProperty =+ AvaloniaProperty.Register<CropCanvas, int>(nameof(SelectedCorner));+/// <summary>Room kept free around the picture for the floating chips and the toolbar.</summary>public static readonly StyledProperty<Thickness> ImagePaddingProperty =AvaloniaProperty.Register<CropCanvas, Thickness>(nameof(ImagePadding));@@ -96,13 +105,20 @@ public sealed class CropCanvas : Controlpublic IBrush? ChipBackground { get => GetValue(ChipBackgroundProperty); set => SetValue(ChipBackgroundProperty, value); }public IBrush? ChipForeground { get => GetValue(ChipForegroundProperty); set => SetValue(ChipForegroundProperty, value); }public bool PlayAnimations { get => GetValue(PlayAnimationsProperty); set => SetValue(PlayAnimationsProperty, value); }+ public bool IsPerspective { get => GetValue(IsPerspectiveProperty); set => SetValue(IsPerspectiveProperty, value); }+ public CropQuad NormalizedCorners { get => GetValue(NormalizedCornersProperty); set => SetValue(NormalizedCornersProperty, value); }+ public int SelectedCorner { get => GetValue(SelectedCornerProperty); set => SetValue(SelectedCornerProperty, value); }public event Action<Rect>? CropRectChanged;+ public event Action<CropQuad>? CornersChanged;+ public event Action<int>? CornerPressed;private CropHandle _activeHandle = CropHandle.None;+ private IPointer? _dragPointer;private CropHandle _hoverHandle = CropHandle.None;private Point _dragStartPoint;private Rect _dragStartCrop;+ private CropQuad _dragStartCorners;// The frame being moved sits on the picture's vertical / horizontal centre line: its guide is drawn.private bool _snappedX, _snappedY;@@ -154,7 +170,8 @@ public sealed class CropCanvas : Controlstatic CropCanvas(){AffectsRender<CropCanvas>(SourceImageProperty, NormalizedCropRectProperty, AspectRatioProperty, ImagePaddingProperty,- SizeTextProperty, AccentBrushProperty, StageBrushProperty, ChipBackgroundProperty, ChipForegroundProperty);+ SizeTextProperty, AccentBrushProperty, StageBrushProperty, ChipBackgroundProperty, ChipForegroundProperty,+ IsPerspectiveProperty, NormalizedCornersProperty, SelectedCornerProperty);FocusableProperty.OverrideDefaultValue<CropCanvas>(false);}@@ -167,6 +184,32 @@ public sealed class CropCanvas : ControlSetRect(frame ?? new Rect(0, 0, 1, 1), animate: true);}+ /// <summary>Starts the corners over without changing the focused corner.</summary>+ public void ResetCorners()+ {+ var same = NormalizedCorners == CropQuad.Full;+ NormalizedCorners = CropQuad.Full;+ if (same)+ CornersChanged?.Invoke(CropQuad.Full);+ InvalidateVisual();+ }++ /// <summary>Moves the selected corner by whole pixels of the picture.</summary>+ public void NudgeCorner(int dx, int dy)+ {+ var size = PixelSize;+ if (SourceImage is null || size.Width <= 0 || size.Height <= 0)+ return;+ NormalizedCorners = CropMath.NudgeCorner(NormalizedCorners, SelectedCorner, dx, dy, size.Width, size.Height);+ }++ internal Point CornerScreenPoint(int corner)+ {+ var image = CalculateImageBounds();+ var p = NormalizedCorners[corner];+ return new Point(image.X + p.X * image.Width, image.Y + p.Y * image.Height);+ }+public void SetAspectRatio(double ratio){AspectRatio = ratio;@@ -297,6 +340,12 @@ public sealed class CropCanvas : Controlprotected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change){+ // A drag pressed in one mode or on one picture means nothing in the other (a frame body is no corner, a+ // corner's delta would move the frame being restored or the next picture's fresh corners): let go of it.+ if ((change.Property == IsPerspectiveProperty || change.Property == SourceImageProperty)+ && _activeHandle != CropHandle.None)+ _dragPointer?.Capture(null);+if (change.Property == NormalizedCropRectProperty){var now = Now();@@ -315,6 +364,10 @@ public sealed class CropCanvas : Control}CropRectChanged?.Invoke(change.GetNewValue<Rect>());}+ else if (change.Property == NormalizedCornersProperty)+ {+ CornersChanged?.Invoke(change.GetNewValue<CropQuad>());+ }else if (change.Property == SourceImageProperty){_soft?.Dispose();@@ -406,6 +459,34 @@ public sealed class CropCanvas : Controlusing (context.PushOpacity(IsDark ? 0.62 : 0.58))context.FillRectangle(StageBrush ?? Brushes.Gray, imgBounds);+ if (IsPerspective)+ {+ var polygon = new StreamGeometry();+ using (var path = polygon.Open())+ {+ path.BeginFigure(CornerScreenPoint(0), true);+ for (var i = 1; i < 4; i++)+ path.LineTo(CornerScreenPoint(i));+ path.EndFigure(true);+ }+ using (context.PushGeometryClip(polygon))+ using (context.PushRenderOptions(new RenderOptions { BitmapInterpolationMode = BitmapInterpolationMode.HighQuality }))+ context.DrawImage(SourceImage, source, imgBounds);+ var accent = AccentBrush ?? Brushes.MediumPurple;+ context.DrawGeometry(null, FrameShadowPen, polygon);+ context.DrawGeometry(null, new Pen(accent, 2), polygon);+ var pop = EaseOutBack(_handlePop.Value(now));+ for (var i = 0; i < 4; i++)+ {+ var radius = 6.5 + (CornerHandle(i) == _poppedHandle ? 2.5 * pop : 0);+ DrawDot(context, accent, CornerScreenPoint(i), radius);+ if (i == SelectedCorner)+ context.DrawEllipse(null, new Pen(accent, 2), CornerScreenPoint(i), radius + 5, radius + 5);+ }+ DrawSizeChip(context, polygon.Bounds, imgBounds, bounds);+ return;+ }+// Inside: the picture itself.var crop = ToScreen(ShownCropRect, imgBounds);using (context.PushClip(crop))@@ -523,6 +604,17 @@ public sealed class CropCanvas : Controlcontext.DrawEllipse(accent, HandleRingPen, center, radius, radius);}+ /// <summary>The corner index (TopLeft, TopRight, BottomRight, BottomLeft) of a perspective corner handle.</summary>+ private static int CornerOf(CropHandle handle) => handle switch+ {+ CropHandle.TopLeft => 0,+ CropHandle.TopRight => 1,+ CropHandle.BottomRight => 2,+ CropHandle.BottomLeft => 3,+ // Perspective hit-testing only hands out corners, and a mode switch lets go of any other handle.+ _ => throw new UnreachableException($"{handle} is not a corner handle."),+ };+private static Point HandlePoint(Rect crop, CropHandle handle) => handle switch{CropHandle.TopLeft => crop.TopLeft,@@ -653,6 +745,14 @@ public sealed class CropCanvas : Control{const double hitTol = 16.0;+ if (IsPerspective)+ {+ for (var i = 0; i < 4; i++)+ if (Distance(pt, CornerScreenPoint(i)) <= hitTol)+ return CornerHandle(i);+ return CropHandle.None;+ }+if (Distance(pt, crop.TopLeft) <= hitTol) return CropHandle.TopLeft;if (Distance(pt, crop.TopRight) <= hitTol) return CropHandle.TopRight;if (Distance(pt, crop.BottomLeft) <= hitTol) return CropHandle.BottomLeft;@@ -670,6 +770,14 @@ public sealed class CropCanvas : Controlprivate static double Distance(Point a, Point b) => Math.Sqrt(Math.Pow(a.X - b.X, 2) + Math.Pow(a.Y - b.Y, 2));+ private static CropHandle CornerHandle(int corner) => corner switch+ {+ 0 => CropHandle.TopLeft,+ 1 => CropHandle.TopRight,+ 2 => CropHandle.BottomRight,+ _ => CropHandle.BottomLeft,+ };+protected override void OnPointerExited(PointerEventArgs e){base.OnPointerExited(e);@@ -705,6 +813,19 @@ public sealed class CropCanvas : Controlreturn;}+ if (IsPerspective)+ {+ // The corner the pointer took hold of, not SelectedCorner: Tab can move the selection mid-drag. It moves+ // by the pointer's travel, like the frame's handles, so grabbing it off-centre doesn't make it jump.+ var corner = CornerOf(_activeHandle);+ var from = _dragStartCorners[corner];+ var target = new Point(+ from.X + (pt.X - _dragStartPoint.X) / imgBounds.Width,+ from.Y + (pt.Y - _dragStartPoint.Y) / imgBounds.Height);+ NormalizedCorners = CropMath.MoveCorner(NormalizedCorners, corner, target, PixelSize.Width, PixelSize.Height);+ return;+ }+// Active manual selection dragif (_activeHandle == CropHandle.CreateNew){@@ -923,14 +1044,27 @@ public sealed class CropCanvas : Controlif (_activeHandle != CropHandle.None){+ if (IsPerspective)+ {+ var corner = CornerOf(_activeHandle);+ SelectedCorner = corner;+ CornerPressed?.Invoke(corner);+ }_dragStartPoint = pt;_dragStartCrop = crop;+ _dragStartCorners = NormalizedCorners;_snappedX = _snappedY = false;e.Pointer.Capture(this);+ _dragPointer = e.Pointer;e.Handled = true;PopHandle(_activeHandle);SetGrid(true);}+ else if (IsPerspective && imgBounds.Contains(pt))+ {+ // A press that misses the corners still lands on the picture: it isn't the stage that moves the window.+ e.Handled = true;+ }}protected override void OnPointerReleased(PointerReleasedEventArgs e)@@ -939,6 +1073,7 @@ public sealed class CropCanvas : Controlif (_activeHandle != CropHandle.None){_activeHandle = CropHandle.None;+ _dragPointer = null;e.Pointer.Capture(null);e.Handled = true;SetGrid(false);@@ -952,6 +1087,7 @@ public sealed class CropCanvas : Controlif (_activeHandle != CropHandle.None){_activeHandle = CropHandle.None;+ _dragPointer = null;SetGrid(false);PopHandle(CropHandle.None);}@@ -959,6 +1095,8 @@ public sealed class CropCanvas : Controlprotected override void OnPointerWheelChanged(PointerWheelEventArgs e){+ if (IsPerspective)+ return;base.OnPointerWheelChanged(e);var imgBounds = CalculateImageBounds();if (imgBounds.Width <= 0 || imgBounds.Height <= 0) return;diff --git a/src/Filee.App/Controls/CropMath.cs b/src/Filee.App/Controls/CropMath.csindex 55252f03..5c271bcc 100644--- a/src/Filee.App/Controls/CropMath.cs+++ b/src/Filee.App/Controls/CropMath.cs@@ -5,8 +5,84 @@ using Avalonia;namespace Filee.App.Controls;+/// <summary>Four normalized picture corners, clockwise from the top left.</summary>+public readonly record struct CropQuad(Point TopLeft, Point TopRight, Point BottomRight, Point BottomLeft)+{+ /// <summary>The whole picture.</summary>+ public static CropQuad Full => new(new Point(0, 0), new Point(1, 0), new Point(1, 1), new Point(0, 1));++ /// <summary>A corner in clockwise order, starting at the top left.</summary>+ public Point this[int corner] => corner switch+ {+ 0 => TopLeft,+ 1 => TopRight,+ 2 => BottomRight,+ 3 => BottomLeft,+ _ => throw new ArgumentOutOfRangeException(nameof(corner)),+ };++ /// <summary>A copy with one corner replaced.</summary>+ public CropQuad With(int corner, Point p) => corner switch+ {+ 0 => this with { TopLeft = p },+ 1 => this with { TopRight = p },+ 2 => this with { BottomRight = p },+ 3 => this with { BottomLeft = p },+ _ => throw new ArgumentOutOfRangeException(nameof(corner)),+ };+}+public static class CropMath{+ /// <summary>Minimum clockwise turn in square original pixels.</summary>+ public const double TurnEpsilon = 1e-6;++ /// <summary>Whether all corners are inside the picture and form a strictly convex clockwise quadrilateral.</summary>+ public static bool IsValidQuad(CropQuad q, int width, int height)+ {+ for (var i = 0; i < 4; i++)+ {+ var p = q[i];+ if (!(p.X >= 0 && p.X <= 1 && p.Y >= 0 && p.Y <= 1))+ return false;+ var next = q[(i + 1) % 4];+ var last = q[(i + 2) % 4];+ var cross = ((next.X - p.X) * width) * ((last.Y - next.Y) * height)+ - ((next.Y - p.Y) * height) * ((last.X - next.X) * width);+ if (!(cross > TurnEpsilon))+ return false;+ }+ return true;+ }++ /// <summary>Moves one corner only when the resulting quadrilateral is valid.</summary>+ public static CropQuad MoveCorner(CropQuad q, int corner, Point target, int width, int height)+ {+ var moved = q.With(corner, target);+ return IsValidQuad(moved, width, height) ? moved : q;+ }++ /// <summary>Snaps one corner to the original pixel grid and moves it by whole pixels.</summary>+ public static CropQuad NudgeCorner(CropQuad q, int corner, int dx, int dy, int width, int height)+ {+ if (width <= 0 || height <= 0)+ return q;+ var p = q[corner];+ var target = new Point((Math.Round(p.X * width) + dx) / width, (Math.Round(p.Y * height) + dy) / height);+ return MoveCorner(q, corner, target, width, height);+ }++ /// <summary>Output size from the longer opposing sides in original pixels, at least 1 by 1.</summary>+ public static PixelSize PerspectiveSize(CropQuad q, int width, int height)+ {+ double Length(Point a, Point b) =>+ Math.Sqrt(Math.Pow((a.X - b.X) * width, 2) + Math.Pow((a.Y - b.Y) * height, 2));++ return new PixelSize(+ Math.Max(1, (int)Math.Round(Math.Max(Length(q.TopLeft, q.TopRight), Length(q.BottomLeft, q.BottomRight)))),+ Math.Max(1, (int)Math.Round(Math.Max(Length(q.TopLeft, q.BottomLeft), Length(q.TopRight, q.BottomRight)))));+ }+/// <summary>The aspect dial's choices, clockwise from the top.</summary>public static IReadOnlyList<string> AspectModes => Modes;diff --git a/src/Filee.App/Services/CropService.cs b/src/Filee.App/Services/CropService.csindex 26030ece..5cba4fee 100644--- a/src/Filee.App/Services/CropService.cs+++ b/src/Filee.App/Services/CropService.cs@@ -2,6 +2,7 @@using System.IO;using Avalonia.Media.Imaging;+using Filee.App.Controls;using Filee.Core.Localization;using Filee.Core.Presets;using Filee.Core.Settings;@@ -103,7 +104,8 @@ public static class CropServiceILocalizer loc,ILogger? log = null,int? originalWidth = null,- int? originalHeight = null)+ int? originalHeight = null,+ CropQuad? corners = null){return await Task.Run(() =>{@@ -147,13 +149,18 @@ public static class CropServiceDdsChannelOrder.Correct(inputPath, image);image.AutoOrient();- var clampedX = Math.Clamp(x, 0, Math.Max(0, (int)image.Width - 1));- var clampedY = Math.Clamp(y, 0, Math.Max(0, (int)image.Height - 1));- var clampedW = (uint)Math.Clamp(width, 1, Math.Max(1, (int)image.Width - clampedX));- var clampedH = (uint)Math.Clamp(height, 1, Math.Max(1, (int)image.Height - clampedY));+ if (corners is { } quad)+ Straighten(image, quad);+ else+ {+ var clampedX = Math.Clamp(x, 0, Math.Max(0, (int)image.Width - 1));+ var clampedY = Math.Clamp(y, 0, Math.Max(0, (int)image.Height - 1));+ var clampedW = (uint)Math.Clamp(width, 1, Math.Max(1, (int)image.Width - clampedX));+ var clampedH = (uint)Math.Clamp(height, 1, Math.Max(1, (int)image.Height - clampedY));- image.Crop(new MagickGeometry(clampedX, clampedY, clampedW, clampedH));- image.ResetPage();+ image.Crop(new MagickGeometry(clampedX, clampedY, clampedW, clampedH));+ image.ResetPage();+ }// Drop EXIF thumbnail so viewers don't show the uncropped previewif (image.GetExifProfile() is { } exif && exif.ThumbnailLength > 0)@@ -181,6 +188,25 @@ public static class CropService});}+ private static void Straighten(MagickImage image, CropQuad quad)+ {+ var size = CropMath.PerspectiveSize(quad, (int)image.Width, (int)image.Height);+ var width = image.Width;+ var height = image.Height;+ var w = (uint)size.Width;+ var h = (uint)size.Height;+ image.VirtualPixelMethod = VirtualPixelMethod.Edge;+ var settings = new DistortSettings(DistortMethod.Perspective) { Viewport = new MagickGeometry(0, 0, w, h) };+ image.Distort(settings,+ [+ quad.TopLeft.X * width, quad.TopLeft.Y * height, 0, 0,+ quad.TopRight.X * width, quad.TopRight.Y * height, w, 0,+ quad.BottomRight.X * width, quad.BottomRight.Y * height, w, h,+ quad.BottomLeft.X * width, quad.BottomLeft.Y * height, 0, h,+ ]);+ image.ResetPage();+ }+private static void PreserveDates(string inputPath, string outputPath, Preset preset, UserDataStore store, ILogger? log){if (!preset.Output.KeepDates && !store.Settings.KeepFileDates)diff --git a/src/Filee.App/ViewModels/CropOverlayViewModel.cs b/src/Filee.App/ViewModels/CropOverlayViewModel.csindex 8a9ef5ed..8e60936e 100644--- a/src/Filee.App/ViewModels/CropOverlayViewModel.cs+++ b/src/Filee.App/ViewModels/CropOverlayViewModel.cs@@ -54,6 +54,32 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable[ObservableProperty] private bool _isBusy;[ObservableProperty] private double _aspectRatio;+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(IsPerspectiveOn))]+ private bool _isPerspective;++ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(IsPerspectiveOn), nameof(CanUsePerspective), nameof(PerspectiveToolTip))]+ private bool _isPdf;++ public bool IsPerspectiveOn => IsPerspective && !IsPdf && IsEditing;+ public bool CanUsePerspective => !IsPdf;+ public string PerspectiveToolTip => _loc[IsPdf ? "crop.perspective_pdf" : "crop.perspective_tip"];++ partial void OnIsPerspectiveChanged(bool value)+ {+ IsAspectDialOpen = false;+ if (value)+ {+ CornersResetRequested?.Invoke();+ PerspectiveTurnedOn?.Invoke();+ }+ else+ {+ UpdateDimensions(CurrentCropRect);+ }+ }+[ObservableProperty][NotifyPropertyChangedFor(nameof(AspectLabel))][NotifyPropertyChangedFor(nameof(AspectToolTip))]@@ -120,6 +146,7 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable/// </summary>[ObservableProperty][NotifyPropertyChangedFor(nameof(IsEditing))]+ [NotifyPropertyChangedFor(nameof(IsPerspectiveOn))]private bool _isFinished;public bool IsEditing => !IsFinished;@@ -176,6 +203,8 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable/// <summary>The frame starts over: the whole picture, or the frame given (a ratio carried from the last picture).</summary>public event Action<Rect?>? ResetRequested;public event Action<double>? AspectRatioChanged;+ public event Action? CornersResetRequested;+ public event Action? PerspectiveTurnedOn;/// <summary>/// The ratio the user picked, kept for the next pictures of the batch (#542), and its orientation; null while none@@ -185,6 +214,7 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposableprivate bool _batchPortrait;public Rect CurrentCropRect { get; set; } = new(0.05, 0.05, 0.9, 0.9);+ public CropQuad CurrentCorners { get; private set; } = CropQuad.Full;public CropOverlayViewModel(IReadOnlyList<string> files, Preset preset, ILocalizer loc, UserDataStore store, ILogger? log = null){@@ -213,6 +243,7 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposableCurrentIndex = index;var path = _files[index];CurrentFileName = Path.GetFileName(path);+ IsPdf = Path.GetExtension(path).Equals(".pdf", StringComparison.OrdinalIgnoreCase);CounterText = _loc.Format("crop.page_counter", index + 1, _files.Count);SaveText = _loc[index < _files.Count - 1 ? "crop.save_next" : "crop.save"];Queue[index].State = CropItemState.Current;@@ -244,6 +275,8 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposablevar frame = CropMath.Centered(AspectRatio, origW, origH);UpdateDimensions(frame);ResetRequested?.Invoke(frame);+ if (IsPerspectiveOn)+ CornersResetRequested?.Invoke();}catch (Exception ex){@@ -272,10 +305,21 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposablepublic void UpdateDimensions(Rect norm){CurrentCropRect = norm;+ if (IsPerspectiveOn)+ return;var size = CropMath.PixelSize(norm, OriginalWidth, OriginalHeight);DimensionsText = $"{size.Width} × {size.Height} px";}+ public void UpdateCorners(CropQuad corners)+ {+ CurrentCorners = corners;+ if (!IsPerspectiveOn)+ return;+ var size = CropMath.PerspectiveSize(corners, OriginalWidth, OriginalHeight);+ DimensionsText = $"{size.Width} × {size.Height} px";+ }+[RelayCommand]public async Task CropAndSaveAsync(){@@ -296,7 +340,7 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposabletry{var result = await CropService.CropFileAsync(path, x, y, w, h, _preset, _store, _loc, _log,- OriginalWidth, OriginalHeight);+ OriginalWidth, OriginalHeight, corners: IsPerspectiveOn ? CurrentCorners : null);if (result.Status == CropStatus.Success && result.OutputPath is not null){_outputs.Add(result.OutputPath);@@ -353,6 +397,11 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable[RelayCommand]public void Reset(){+ if (IsPerspectiveOn)+ {+ CornersResetRequested?.Invoke();+ return;+ }_batchAspect = null; // the next pictures start free againSelectedAspect = "free";IsPortrait = OriginalHeight > OriginalWidth;@@ -495,6 +544,7 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable}OnPropertyChanged(nameof(AspectLabel));OnPropertyChanged(nameof(AspectToolTip));+ OnPropertyChanged(nameof(PerspectiveToolTip));OnPropertyChanged(nameof(OrientationText));foreach (var item in Queue)item.RefreshTexts();diff --git a/src/Filee.App/Views/CropOverlayWindow.axaml b/src/Filee.App/Views/CropOverlayWindow.axamlindex c52e3c47..533ab671 100644--- a/src/Filee.App/Views/CropOverlayWindow.axaml+++ b/src/Filee.App/Views/CropOverlayWindow.axaml@@ -10,7 +10,7 @@x:DataType="vm:CropOverlayViewModel"Title="{DynamicResource preset.crop}"Icon="avares://Filee/Assets/Icons/filee.ico"- Width="1040" Height="720" MinWidth="680" MinHeight="500"+ Width="1040" Height="720" MinWidth="720" MinHeight="500"WindowDecorations="None"Background="Transparent"TransparencyLevelHint="Transparent"@@ -18,6 +18,7 @@CanResize="True"><Window.Resources>+ <StreamGeometry x:Key="Crop.Perspective">M5 4L20 6L18 20L3 17Z M5 6L5 4L7 4L7 6Z M18 5L21 5L21 8L18 8Z M16 18L19 18L19 21L16 21Z M2 15L5 15L5 18L2 18Z</StreamGeometry><StreamGeometry x:Key="Crop.Swap">M7 3.5h8.5A4.5 4.5 0 0 1 20 8v2.2h2.2l-3.7 4.3-3.7-4.3H17V8a1.5 1.5 0 0 0-1.5-1.5H7z M17 20.5H8.5A4.5 4.5 0 0 1 4 16v-2.2H1.8l3.7-4.3 3.7 4.3H7V16a1.5 1.5 0 0 0 1.5 1.5H17z</StreamGeometry><StreamGeometry x:Key="Crop.Maximize">M4 7a3 3 0 0 1 3-3h10a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3z M7 6.2a.8.8 0 0 0-.8.8v10c0 .44.36.8.8.8h10a.8.8 0 0 0 .8-.8V7a.8.8 0 0 0-.8-.8z</StreamGeometry><StreamGeometry x:Key="Crop.Grip">M18 10a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z M18 16a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z M12 16a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z</StreamGeometry>@@ -45,7 +46,7 @@</Style><!-- Toolbar buttons: quiet, round, a soft tint on hover -->- <Style Selector="Button.tool">+ <Style Selector="Button.tool, ToggleButton.tool"><Setter Property="Background" Value="Transparent" /><Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" /><Setter Property="BorderThickness" Value="0" />@@ -54,14 +55,32 @@<Setter Property="VerticalAlignment" Value="Center" /><Setter Property="Cursor" Value="Hand" /></Style>- <Style Selector="Button.tool:pointerover /template/ ContentPresenter#PART_ContentPresenter">+ <Style Selector="Button.tool:pointerover /template/ ContentPresenter#PART_ContentPresenter, ToggleButton.tool:pointerover /template/ ContentPresenter#PART_ContentPresenter"><Setter Property="Background" Value="{DynamicResource AccentFaintBrush}" /><Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" /></Style><Style Selector="Button.tool.open /template/ ContentPresenter#PART_ContentPresenter"><Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" /></Style>- <Style Selector="Button.round">+ <Style Selector="ToggleButton.tool:checked /template/ ContentPresenter#PART_ContentPresenter">+ <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />+ <Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />+ </Style>+ <Style Selector="Button.tool:disabled /template/ ContentPresenter#PART_ContentPresenter, ToggleButton.tool:disabled /template/ ContentPresenter#PART_ContentPresenter">+ <Setter Property="Background" Value="Transparent" />+ </Style>+ <Style Selector="Button.tool:disabled, ToggleButton.tool:disabled">+ <Setter Property="Opacity" Value="0.45" />+ </Style>+ <Style Selector="Button.corner">+ <Setter Property="Width" Value="24" />+ <Setter Property="Height" Value="24" />+ <Setter Property="Background" Value="Transparent" />+ <Setter Property="BorderThickness" Value="0" />+ <Setter Property="Padding" Value="0" />+ <Setter Property="FocusAdorner" Value="{x:Null}" />+ </Style>+ <Style Selector="Button.round, ToggleButton.round"><Setter Property="Padding" Value="9" /><Setter Property="Width" Value="34" /><Setter Property="Height" Value="34" />@@ -204,8 +223,15 @@BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1"BoxShadow="{DynamicResource CardShadow}"><Grid x:Name="Stage">+ <Canvas x:Name="CornerLayer" IsVisible="{Binding IsPerspectiveOn}" FlowDirection="LeftToRight">+ <Button x:Name="CornerTopLeft" Classes="corner" AutomationProperties.Name="{DynamicResource crop.corner_top_left}" />+ <Button x:Name="CornerTopRight" Classes="corner" AutomationProperties.Name="{DynamicResource crop.corner_top_right}" />+ <Button x:Name="CornerBottomRight" Classes="corner" AutomationProperties.Name="{DynamicResource crop.corner_bottom_right}" />+ <Button x:Name="CornerBottomLeft" Classes="corner" AutomationProperties.Name="{DynamicResource crop.corner_bottom_left}" />+ </Canvas><!-- The picture, the frame and the backdrop --><c:CropCanvas x:Name="Canvas"+ IsPerspective="{Binding IsPerspectiveOn}"SourceImage="{Binding PreviewImage}"SizeText="{Binding DimensionsText}"PixelSize="{Binding PixelSize}"@@ -300,6 +326,7 @@<Border Classes="float" Padding="5"><StackPanel Orientation="Horizontal" Spacing="3"><Button x:Name="DialButton" Classes="tool" Classes.open="{Binding IsAspectDialOpen}" Padding="8,6,12,6"+ IsEnabled="{Binding !IsPerspectiveOn}"Command="{Binding ToggleAspectDialCommand}"ToolTip.Tip="{Binding AspectToolTip}" AutomationProperties.Name="{Binding AspectToolTip}"><StackPanel Orientation="Horizontal" Spacing="8">@@ -309,13 +336,21 @@<Border Classes="key"><TextBlock Text="A" /></Border></StackPanel></Button>+ <!-- Icon only, to keep the toolbar narrow; the name is in the tooltip and for screen readers. -->+ <ToggleButton x:Name="PerspectiveButton" Classes="tool round" IsChecked="{Binding IsPerspective}"+ IsEnabled="{Binding CanUsePerspective}" ToolTip.Tip="{Binding PerspectiveToolTip}" ToolTip.ShowOnDisabled="True"+ AutomationProperties.Name="{DynamicResource crop.perspective}">+ <PathIcon Width="16" Height="16" Data="{StaticResource Crop.Perspective}" Foreground="{DynamicResource AccentBrush}" />+ </ToggleButton><!-- The custom ratio: W × H, only while it's the one in use. --><StackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" IsVisible="{Binding IsCustomAspect}"><NumericUpDown x:Name="CustomWidthBox" Value="{Binding CustomWidth}" Minimum="1" Maximum="99999" Increment="1"+ IsEnabled="{Binding !IsPerspectiveOn}"FormatString="0" Width="64" ShowButtonSpinner="False" HorizontalContentAlignment="Center" AutomationProperties.Name="{DynamicResource crop.custom_width}"ToolTip.Tip="{DynamicResource crop.custom_width}" /><TextBlock Text="×" VerticalAlignment="Center" Foreground="{DynamicResource TextSecondaryBrush}" /><NumericUpDown x:Name="CustomHeightBox" Value="{Binding CustomHeight}" Minimum="1" Maximum="99999" Increment="1"+ IsEnabled="{Binding !IsPerspectiveOn}"FormatString="0" Width="64" ShowButtonSpinner="False" HorizontalContentAlignment="Center" AutomationProperties.Name="{DynamicResource crop.custom_height}"ToolTip.Tip="{DynamicResource crop.custom_height}" /></StackPanel>@@ -346,7 +381,11 @@</Button></StackPanel></Border>- <TextBlock Text="{DynamicResource crop.hint_keys}" FontSize="11" HorizontalAlignment="Center" TextAlignment="Center"+ <TextBlock x:Name="RectangularHint" Text="{DynamicResource crop.hint_keys}" IsVisible="{Binding !IsPerspectiveOn}"+ FontSize="11" HorizontalAlignment="Center" TextAlignment="Center"+ TextWrapping="Wrap" MaxWidth="560" Opacity="0.8" Foreground="{DynamicResource TextSecondaryBrush}" />+ <TextBlock x:Name="PerspectiveHint" Text="{DynamicResource crop.hint_keys_perspective}" IsVisible="{Binding IsPerspectiveOn}"+ FontSize="11" HorizontalAlignment="Center" TextAlignment="Center"TextWrapping="Wrap" MaxWidth="560" Opacity="0.8" Foreground="{DynamicResource TextSecondaryBrush}" /></StackPanel>@@ -411,6 +450,7 @@<!-- The aspect dial over everything; a click beside it closes it --><Border x:Name="DialScrim" Background="Transparent" IsVisible="{Binding IsAspectDialOpen}" PointerPressed="OnScrimPressed" /><c:AspectDial x:Name="Dial" HorizontalAlignment="Left" VerticalAlignment="Top" IsVisible="False"+ IsEnabled="{Binding !IsPerspectiveOn}"Classes.open="{Binding IsAspectDialOpen}"CornerRadius="{DynamicResource SoftRadius}"SelectedMode="{Binding SelectedAspect}" IsPortrait="{Binding IsPortrait}" OriginalRatio="{Binding OriginalRatio}"diff --git a/src/Filee.App/Views/CropOverlayWindow.axaml.cs b/src/Filee.App/Views/CropOverlayWindow.axaml.csindex f34ea62b..f616eb82 100644--- a/src/Filee.App/Views/CropOverlayWindow.axaml.cs+++ b/src/Filee.App/Views/CropOverlayWindow.axaml.cs@@ -41,6 +41,14 @@ public partial class CropOverlayWindow : WindowAddHandler(KeyDownEvent, OnKeyDownFirst, RoutingStrategies.Tunnel);ResizeGrip.PointerPressed += OnGripPressed;Stage.SizeChanged += (_, _) => PlaceDial();+ Canvas.SizeChanged += (_, _) => PlaceCorners();+ var corners = CornerButtons;+ for (var i = 0; i < corners.Length; i++)+ {+ var corner = i;+ corners[i].GotFocus += (_, _) => Canvas.SelectedCorner = corner;+ }+ Canvas.CornerPressed += corner => corners[corner].Focus(NavigationMethod.Pointer);// Every move over the stage, also over the canvas and the buttons that handle it.Stage.AddHandler(PointerMovedEvent, (_, e) => _pointer = e.GetPosition(Stage), RoutingStrategies.Tunnel, handledEventsToo: true);Stage.PointerExited += (_, _) => _pointer = null;@@ -90,8 +98,16 @@ public partial class CropOverlayWindow : Windowvm.CloseRequested += Close;vm.ResetRequested += frame => Canvas.ResetCrop(frame);vm.AspectRatioChanged += ratio => Canvas.SetAspectRatio(ratio);+ vm.CornersResetRequested += Canvas.ResetCorners;+ vm.PerspectiveTurnedOn += () =>+ Dispatcher.UIThread.Post(() => CornerTopLeft.Focus(NavigationMethod.Tab), DispatcherPriority.Input);vm.PropertyChanged += OnViewModelChanged;Canvas.CropRectChanged += rect => vm.UpdateDimensions(rect);+ Canvas.CornersChanged += corners =>+ {+ vm.UpdateCorners(corners);+ PlaceCorners();+ };Closed += (_, _) => vm.Dispose();}}@@ -102,12 +118,29 @@ public partial class CropOverlayWindow : Windowreturn;if (e.PropertyName == nameof(CropOverlayViewModel.IsAspectDialOpen))ShowDial(_vm.IsAspectDialOpen);+ else if (e.PropertyName == nameof(CropOverlayViewModel.IsPerspectiveOn) && _vm.IsPerspectiveOn+ && FocusManager?.GetFocusedElement() is null)+ // Back after a PDF, whose rectangle hid the corners and dropped their focus: hand it back.+ Dispatcher.UIThread.Post(() => CornerButtons[Canvas.SelectedCorner].Focus(NavigationMethod.Tab), DispatcherPriority.Input);else if (e.PropertyName == nameof(CropOverlayViewModel.CurrentIndex))Dispatcher.UIThread.Post(() => Strip.ContainerFromIndex(_vm.CurrentIndex)?.BringIntoView(), DispatcherPriority.Background);}private void OnMotionChanged(object? sender, EventArgs e) => Canvas.PlayAnimations = Motion.Enabled;+ private Button[] CornerButtons => [CornerTopLeft, CornerTopRight, CornerBottomRight, CornerBottomLeft];++ private void PlaceCorners()+ {+ var corners = CornerButtons;+ for (var i = 0; i < corners.Length; i++)+ {+ var p = Canvas.CornerScreenPoint(i);+ Avalonia.Controls.Canvas.SetLeft(corners[i], p.X - 12);+ Avalonia.Controls.Canvas.SetTop(corners[i], p.Y - 12);+ }+ }+// ───────────────────────── The aspect dial ─────────────────────────private void ShowDial(bool open)@@ -183,6 +216,9 @@ public partial class CropOverlayWindow : Windowreturn;switch (e.Key){+ case Key.A or Key.X when plain && vm.IsPerspectiveOn:+ e.Handled = true;+ break;case Key.Escape:if (dialOpen)vm.IsAspectDialOpen = false;@@ -222,8 +258,12 @@ public partial class CropOverlayWindow : Windowcase Key.Left or Key.Right or Key.Up or Key.Down when vm.IsEditing && !vm.IsBusy&& (e.KeyModifiers & ~KeyModifiers.Shift) == KeyModifiers.None:var step = e.KeyModifiers.HasFlag(KeyModifiers.Shift) ? 10 : 1;- Canvas.Nudge(e.Key switch { Key.Left => -step, Key.Right => step, _ => 0 },- e.Key switch { Key.Up => -step, Key.Down => step, _ => 0 });+ var dx = e.Key switch { Key.Left => -step, Key.Right => step, _ => 0 };+ var dy = e.Key switch { Key.Up => -step, Key.Down => step, _ => 0 };+ if (vm.IsPerspectiveOn)+ Canvas.NudgeCorner(dx, dy);+ else+ Canvas.Nudge(dx, dy);e.Handled = true;break;}diff --git a/tests/Filee.App.Tests/CropMathTests.cs b/tests/Filee.App.Tests/CropMathTests.csindex 69860b87..ffec1021 100644--- a/tests/Filee.App.Tests/CropMathTests.cs+++ b/tests/Filee.App.Tests/CropMathTests.cs@@ -8,6 +8,108 @@ namespace Filee.App.Tests;public class CropMathTests{+ [Fact]+ public void A_corner_moves_only_to_a_convex_untwisted_shape_inside_the_picture()+ {+ var square = new CropQuad(new Point(0.2, 0.2), new Point(0.8, 0.2),+ new Point(0.8, 0.8), new Point(0.2, 0.8));+ var targets = new[]+ {+ new Point(0.9, 0.7), // twisted+ new Point(0.6, 0.6), // concave+ new Point(0.5, 0.5), // three collinear points+ new Point(0.9, 0.2), // passes the neighbouring corner+ new Point(-0.1, 0.2),+ new Point(0.2, 1.1),+ };+ static Point Rotate(Point p) => new(1 - p.Y, p.X);++ for (var corner = 0; corner < 4; corner++)+ {+ var valid = new Point(0.3, 0.3);+ foreach (var _ in Enumerable.Range(0, corner))+ valid = Rotate(valid);+ var moved = CropMath.MoveCorner(square, corner, valid, 1600, 1000);+ for (var i = 0; i < 4; i++)+ Assert.Equal(i == corner ? valid : square[i], moved[i]);++ foreach (var initial in targets)+ {+ var target = initial;+ foreach (var _ in Enumerable.Range(0, corner))+ target = Rotate(target);+ Assert.Equal(square, CropMath.MoveCorner(square, corner, target, 1600, 1000));+ }+ }++ var passing = new CropQuad(new Point(0.2, 0.2), new Point(0.6, 0.2),+ new Point(0.6, 0.8), new Point(0.2, 0.8));+ Assert.Equal(passing, CropMath.MoveCorner(passing, 0, new Point(0.7, 0.2), 1600, 1000));+ Assert.False(CropMath.IsValidQuad(new CropQuad(new Point(0, 0), new Point(0, 1),+ new Point(1, 1), new Point(1, 0)), 1600, 1000));++ foreach (var (delta, expected) in new[] { (2.5e-9, true), (6.25e-10, false) })+ {+ var turn = 800 * delta;+ Assert.Equal(expected, turn > 1e-6);+ var thin = new CropQuad(new Point(0, 0), new Point(800 / 1600.0, 0),+ new Point(1, delta / 1000), new Point(0, 1));+ Assert.Equal(expected, CropMath.IsValidQuad(thin, 1600, 1000));+ }++ var fractional = new CropQuad(new Point(0.6, 0.2), new Point(1, 0), new Point(1, 1), new Point(0, 1));+ Assert.Equal(fractional, CropMath.MoveCorner(CropQuad.Full, 0, fractional.TopLeft, 1, 1));+ }++ [Fact]+ public void Perspective_size_is_the_longer_of_each_pair_of_sides()+ {+ Assert.Equal(new PixelSize(1600, 1000), CropMath.PerspectiveSize(CropQuad.Full, 1600, 1000));+ var trapezoid = new CropQuad(new Point(0.2, 0.1), new Point(0.7, 0.2),+ new Point(0.9, 0.8), new Point(0.1, 0.9));+ double Distance(Point a, Point b) =>+ Math.Sqrt(Math.Pow((a.X - b.X) * 1600, 2) + Math.Pow((a.Y - b.Y) * 1000, 2));+ var expectedWidth = (int)Math.Round(Math.Max(Distance(trapezoid.TopLeft, trapezoid.TopRight),+ Distance(trapezoid.BottomLeft, trapezoid.BottomRight)));+ var expectedHeight = (int)Math.Round(Math.Max(Distance(trapezoid.TopLeft, trapezoid.BottomLeft),+ Distance(trapezoid.TopRight, trapezoid.BottomRight)));+ Assert.Equal(new PixelSize(expectedWidth, expectedHeight), CropMath.PerspectiveSize(trapezoid, 1600, 1000));+ var rounded = new CropQuad(new Point(0, 0), new Point(0.126, 0),+ new Point(0.126, 0.234), new Point(0, 0.234));+ Assert.Equal(new PixelSize(13, 23), CropMath.PerspectiveSize(rounded, 100, 100));+ var tiny = new CropQuad(new Point(0, 0), new Point(0.001, 0),+ new Point(0.001, 0.001), new Point(0, 0.001));+ Assert.Equal(new PixelSize(1, 1), CropMath.PerspectiveSize(tiny, 100, 100));+ }++ [Fact]+ public void Arrow_keys_move_a_corner_by_whole_pixels_and_stop_where_the_shape_would_break()+ {+ var loose = new CropQuad(new Point(200.4 / 1000, 200.4 / 1000), new Point(0.8, 0.2),+ new Point(0.8, 0.8), new Point(0.2, 0.8));+ Assert.Equal(new Point(201 / 1000.0, 190 / 1000.0),+ CropMath.NudgeCorner(loose, 0, 1, -10, 1000, 1000).TopLeft);+ for (var corner = 0; corner < 4; corner++)+ {+ var dx = corner is 0 or 3 ? 1 : -1;+ var dy = corner is 0 or 1 ? 10 : -10;+ var moved = CropMath.NudgeCorner(CropQuad.Full, corner, dx, dy, 1000, 1000);+ for (var i = 0; i < 4; i++)+ {+ var p = CropQuad.Full[i];+ var expected = i == corner ? new Point(p.X + dx / 1000.0, p.Y + dy / 1000.0) : p;+ Assert.Equal(expected.X, moved[i].X, 9);+ Assert.Equal(expected.Y, moved[i].Y, 9);+ }+ Assert.Equal(CropQuad.Full, CropMath.NudgeCorner(CropQuad.Full, corner, -dx, -dy, 1000, 1000));+ }+ var almostLine = new CropQuad(new Point(0.2, 0.799), new Point(0.8, 0.2),+ new Point(0.8, 0.8), new Point(0.2, 0.8));+ Assert.True(CropMath.IsValidQuad(almostLine, 1000, 1000));+ Assert.Equal(almostLine, CropMath.NudgeCorner(almostLine, 0, 0, 1, 1000, 1000));+ Assert.Equal(loose, CropMath.NudgeCorner(loose, 0, 1, 1, 0, 0));+ }+[Theory][InlineData("free", false, 0.0)][InlineData("1:1", true, 1.0)]diff --git a/tests/Filee.App.Tests/CropOverlayTests.cs b/tests/Filee.App.Tests/CropOverlayTests.csindex 49f2b346..8c0a14bf 100644--- a/tests/Filee.App.Tests/CropOverlayTests.cs+++ b/tests/Filee.App.Tests/CropOverlayTests.cs@@ -1,12 +1,16 @@// The crop overlay's window: the stage with the frame and its size chip, the aspect dial, the strip of several files,// the end summary (screenshots in light and dark, short and long languages), and its keys and ratio choices.+using System.ComponentModel;using System.IO;using Avalonia;+using Avalonia.Automation;using Avalonia.Controls;+using Avalonia.Controls.Primitives;using Avalonia.Headless;using Avalonia.Headless.XUnit;using Avalonia.Input;+using Avalonia.Interactivity;using Avalonia.Threading;using Avalonia.VisualTree;using Filee.App.Controls;@@ -18,6 +22,8 @@ using Filee.Core.Presets;using Filee.Core.Settings;using ImageMagick;using ImageMagick.Drawing;+using PdfSharp.Pdf;+using PdfSharp.Pdf.IO;using static Filee.App.Tests.RenderTests;namespace Filee.App.Tests;@@ -450,6 +456,578 @@ public class CropOverlayTests});}+ [AvaloniaFact]+ public async Task Perspective_starts_off_sits_after_the_ratio_button_and_starts_on_the_picture_corners()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ var button = window.FindControl<ToggleButton>("PerspectiveButton")!;+ var canvas = window.CropCanvas;+ Assert.False(button.IsChecked);+ Assert.False(canvas.IsPerspective);+ var toolbar = (StackPanel)button.Parent!;+ Assert.Same(button, toolbar.Children[toolbar.Children.IndexOf(window.FindControl<Button>("DialButton")!) + 1]);+ canvas.NormalizedCropRect = new Rect(0.3, 0.2, 0.4, 0.5);+ Assert.Equal("640 × 500 px", vm.DimensionsText);+ ClickPerspective(window);+ Assert.True(canvas.IsPerspective);+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ Assert.Equal("1600 × 1000 px", vm.DimensionsText);+ canvas.NormalizedCorners = CropQuad.Full.With(0, new Point(0.2, 0.1));+ ClickPerspective(window);+ ClickPerspective(window);+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ Assert.Equal("1600 × 1000 px", vm.DimensionsText);+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Each_corner_drags_on_its_own()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ canvas.NormalizedCorners = new CropQuad(new Point(0.15, 0.12), new Point(0.82, 0.20), new Point(0.90, 0.85), new Point(0.10, 0.78));+ var image = canvas.CalculateImageBounds();+ for (var i = 0; i < 4; i++)+ {+ var before = canvas.NormalizedCorners;+ // Grabbed a few pixels off the dot: the corner follows the pointer's travel, it doesn't jump to it.+ var start = canvas.TranslatePoint(canvas.CornerScreenPoint(i), window)!.Value + new Vector(6, -5);+ Drag(window, start, start + new Vector(20, 15));+ Assert.InRange(canvas.NormalizedCorners[i].X, before[i].X + 20 / image.Width - 0.002, before[i].X + 20 / image.Width + 0.002);+ Assert.InRange(canvas.NormalizedCorners[i].Y, before[i].Y + 15 / image.Height - 0.002, before[i].Y + 15 / image.Height + 0.002);+ foreach (var other in Enumerable.Range(0, 4).Where(c => c != i))+ Assert.Equal(before[other], canvas.NormalizedCorners[other]);+ Assert.True(CornerButtons(window)[i].IsFocused);+ Assert.Equal(i, canvas.SelectedCorner);+ }+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Tab_during_a_drag_leaves_the_dragged_corner_in_hand()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ var image = canvas.CalculateImageBounds();+ var start = canvas.TranslatePoint(canvas.CornerScreenPoint(0), window)!.Value;+ Pump();+ window.MouseDown(start, MouseButton.Left);+ window.MouseMove(start + new Vector(20, 15));+ Pump();+ Press(window, Key.Tab);+ Assert.Equal(1, canvas.SelectedCorner);+ window.MouseMove(start + new Vector(40, 25));+ window.MouseUp(start + new Vector(40, 25), MouseButton.Left);+ Pump();+ Assert.InRange(canvas.NormalizedCorners[0].X, 40 / image.Width - 0.002, 40 / image.Width + 0.002);+ Assert.InRange(canvas.NormalizedCorners[0].Y, 25 / image.Height - 0.002, 25 / image.Height + 0.002);+ foreach (var other in new[] { 1, 2, 3 })+ Assert.Equal(CropQuad.Full[other], canvas.NormalizedCorners[other]);+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Switching_perspective_mid_drag_lets_go_of_the_drag()+ {+ // Frame held, perspective turned on from the keyboard: the held frame body moves no corner.+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ var canvas = window.CropCanvas;+ var toggle = window.FindControl<ToggleButton>("PerspectiveButton")!;+ var image = canvas.CalculateImageBounds();+ var r = canvas.NormalizedCropRect;+ var start = canvas.TranslatePoint(new Point(image.X + (r.X + r.Width / 2) * image.Width, image.Y + (r.Y + r.Height / 2) * image.Height), window)!.Value;+ Pump();+ toggle.Focus(NavigationMethod.Tab);+ window.MouseDown(start, MouseButton.Left);+ window.MouseMove(start + new Vector(10, 8));+ Pump();+ Assert.True(toggle.IsFocused);+ Press(window, Key.Space);+ window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.None, null);+ Pump();+ Assert.True(canvas.IsPerspective);+ // Up and right: read as a corner's travel, it would be a move the bottom-left corner is allowed to make.+ window.MouseMove(start + new Vector(60, -40));+ window.MouseUp(start + new Vector(60, -40), MouseButton.Left);+ Pump();+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ return Task.CompletedTask;+ });+ // A corner held, perspective turned off: the frame that comes back is the one from before.+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ var canvas = window.CropCanvas;+ var toggle = window.FindControl<ToggleButton>("PerspectiveButton")!;+ var before = canvas.NormalizedCropRect;+ ClickPerspective(window);+ var start = canvas.TranslatePoint(canvas.CornerScreenPoint(0), window)!.Value;+ window.MouseDown(start, MouseButton.Left);+ window.MouseMove(start + new Vector(20, 15));+ Pump();+ toggle.Focus(NavigationMethod.Tab);+ Assert.True(toggle.IsFocused);+ Press(window, Key.Space);+ window.KeyRelease(Key.Space, RawInputModifiers.None, PhysicalKey.None, null);+ Pump();+ Assert.False(canvas.IsPerspective);+ window.MouseMove(start + new Vector(60, 40));+ window.MouseUp(start + new Vector(60, 40), MouseButton.Left);+ Pump();+ Assert.Equal(before, canvas.NormalizedCropRect);+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task A_corner_held_while_the_next_picture_opens_doesnt_move_its_corners()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg", "two.jpg"], async (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ var start = canvas.TranslatePoint(canvas.CornerScreenPoint(0), window)!.Value;+ window.MouseDown(start, MouseButton.Left);+ window.MouseMove(start + new Vector(20, 15));+ Pump();+ var first = canvas.SourceImage;+ await vm.CropAndSaveAsync();+ Pump();+ Assert.NotSame(first, canvas.SourceImage);+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ window.MouseMove(start + new Vector(60, 40));+ window.MouseUp(start + new Vector(60, 40), MouseButton.Left);+ Pump();+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ });+ }++ [AvaloniaFact]+ public async Task A_corner_isnt_dragged_or_nudged_into_a_broken_shape_or_off_the_picture()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ var rectangle = new CropQuad(new Point(320, 200), new Point(960, 200), new Point(960, 800), new Point(320, 800));+ var cases = new[]+ {+ (Kind: "twisted", Keys: false, Quad: rectangle, Target: new Point(1120, 500), Key: Key.Right, Shift: false),+ (Kind: "concave", Keys: false, Quad: rectangle, Target: new Point(700, 650), Key: Key.Right, Shift: false),+ (Kind: "line", Keys: false, Quad: rectangle, Target: new Point(640, 500), Key: Key.Right, Shift: false),+ (Kind: "outside", Keys: false, Quad: rectangle.With(0, new Point(0, 200)), Target: new Point(-50, 200), Key: Key.Left, Shift: false),+ (Kind: "twisted", Keys: true, Quad: new CropQuad(new Point(950, 200), new Point(955, 200), new Point(955, 800), new Point(950, 800)), Target: new Point(960, 200), Key: Key.Right, Shift: true),+ (Kind: "concave", Keys: true, Quad: rectangle.With(0, new Point(580, 550)), Target: new Point(590, 550), Key: Key.Right, Shift: true),+ (Kind: "line", Keys: true, Quad: rectangle.With(0, new Point(639, 500)), Target: new Point(640, 500), Key: Key.Right, Shift: false),+ (Kind: "outside", Keys: true, Quad: rectangle.With(0, new Point(0, 200)), Target: new Point(-1, 200), Key: Key.Left, Shift: false),+ };+ foreach (var test in cases)+ {+ var q = test.Quad;+ var normalized = new CropQuad(new Point(q[0].X / 1600, q[0].Y / 1000), new Point(q[1].X / 1600, q[1].Y / 1000),+ new Point(q[2].X / 1600, q[2].Y / 1000), new Point(q[3].X / 1600, q[3].Y / 1000));+ Assert.True(CropMath.IsValidQuad(normalized, 1600, 1000), test.Kind);+ AssertForbiddenKind(test.Kind, q.With(0, test.Target));+ canvas.NormalizedCorners = normalized;+ CornerButtons(window)[0].Focus(NavigationMethod.Tab);+ Pump();+ if (test.Keys)+ Press(window, test.Key, test.Shift ? RawInputModifiers.Shift : RawInputModifiers.None);+ else+ {+ var image = canvas.CalculateImageBounds();+ var target = new Point(image.X + test.Target.X / 1600 * image.Width, image.Y + test.Target.Y / 1000 * image.Height);+ Drag(window, canvas.TranslatePoint(canvas.CornerScreenPoint(0), window)!.Value, canvas.TranslatePoint(target, window)!.Value);+ }+ Assert.Equal(normalized, canvas.NormalizedCorners);+ }+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Tab_picks_a_corner_and_arrows_move_it()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg", "tall.jpg"], async (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ var buttons = CornerButtons(window);+ Assert.True(buttons[0].IsFocused);+ Assert.Equal(0, canvas.SelectedCorner);+ for (var i = 1; i < 4; i++)+ {+ Press(window, Key.Tab);+ Assert.True(buttons[i].IsFocused);+ Assert.Equal(i, canvas.SelectedCorner);+ }+ for (var i = 2; i >= 0; i--)+ {+ Press(window, Key.Tab, RawInputModifiers.Shift);+ Assert.True(buttons[i].IsFocused);+ Assert.Equal(i, canvas.SelectedCorner);+ }+ Press(window, Key.Tab);+ Press(window, Key.Right);+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ Press(window, Key.Left);+ Press(window, Key.Left);+ Press(window, Key.Down, RawInputModifiers.Shift);+ Assert.Equal(CropQuad.Full.With(1, new Point(1598.0 / 1600, 10.0 / 1000)), canvas.NormalizedCorners);+ Press(window, Key.Tab);+ Press(window, Key.Tab);+ Press(window, Key.R);+ Assert.True(buttons[3].IsFocused);+ Assert.Equal(3, canvas.SelectedCorner);+ Press(window, Key.Up);+ Assert.Equal(CropQuad.Full.With(3, new Point(0, 999.0 / 1000)), canvas.NormalizedCorners);+ var loaded = UntilAsync(vm, () => vm.CurrentIndex == 1 && !vm.IsBusy);+ Press(window, Key.Enter);+ await loaded;+ Pump();+ Assert.True(buttons[3].IsFocused);+ Assert.Equal(3, canvas.SelectedCorner);+ Press(window, Key.Up);+ Assert.Equal(CropQuad.Full.With(3, new Point(0, 1599.0 / 1600)), canvas.NormalizedCorners);+ Settle(window);+ Save(window, "crop-perspective-keys-en.png");+ });+ }++ [AvaloniaFact]+ public async Task Perspective_turns_off_the_ratio_the_frame_moves_and_the_wheel()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ vm.SetAspect("4:3");+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ Assert.False(window.FindControl<Button>("DialButton")!.IsEnabled);+ Assert.False(window.CustomWidthBox.IsEnabled);+ Assert.False(window.CustomHeightBox.IsEnabled);+ var portrait = vm.IsPortrait;+ Press(window, Key.A);+ Assert.False(vm.IsAspectDialOpen);+ Press(window, Key.X);+ Assert.Equal(portrait, vm.IsPortrait);+ Assert.Equal("4:3", vm.SelectedAspect);+ canvas.NormalizedCorners = new CropQuad(new Point(0.2, 0.2), new Point(0.8, 0.2), new Point(0.8, 0.8), new Point(0.2, 0.8));+ var before = canvas.NormalizedCorners;+ var rect = canvas.NormalizedCropRect;+ var image = canvas.CalculateImageBounds();+ foreach (var p in new[] { new Point(0.5, 0.2), new Point(0.5, 0.5), new Point(0.1, 0.5) })+ {+ var start = canvas.TranslatePoint(new Point(image.X + image.Width * p.X, image.Y + image.Height * p.Y), window)!.Value;+ Drag(window, start, start + new Vector(20, 15));+ window.MouseWheel(start, new Vector(0, -1));+ Pump();+ Assert.Equal(before, canvas.NormalizedCorners);+ Assert.Equal(rect, canvas.NormalizedCropRect);+ }+ var size = CropMath.PerspectiveSize(before, 1600, 1000);+ Assert.Equal($"{size.Width} × {size.Height} px", vm.DimensionsText);+ canvas.NormalizedCropRect = new Rect(0.1, 0.1, 0.3, 0.3);+ Assert.Equal($"{size.Width} × {size.Height} px", vm.DimensionsText);+ Press(window, Key.R);+ Assert.Equal(CropQuad.Full, canvas.NormalizedCorners);+ Assert.True(canvas.IsPerspective);+ Assert.Equal("4:3", vm.SelectedAspect);+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Turning_perspective_off_brings_back_the_frame_or_the_next_pictures_first_frame()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ vm.SetAspect("4:3");+ window.CropCanvas.NormalizedCropRect = new Rect(0.2, 0.15, 0.5, 0.6);+ var before = window.CropCanvas.NormalizedCropRect;+ var dimensions = vm.DimensionsText;+ var portrait = vm.IsPortrait;+ ClickPerspective(window);+ window.CropCanvas.NormalizedCorners = CropQuad.Full.With(0, new Point(0.2, 0.1));+ ClickPerspective(window);+ Assert.Equal(before, window.CropCanvas.NormalizedCropRect);+ Assert.Equal("4:3", vm.SelectedAspect);+ Assert.Equal(portrait, vm.IsPortrait);+ Assert.Equal(dimensions, vm.DimensionsText);+ return Task.CompletedTask;+ });+ foreach (var custom in new[] { false, true })+ {+ await WithOverlayAsync("en", false, ["harbour.jpg", "tall.jpg"], async (window, vm, _) =>+ {+ vm.SetAspect(custom ? "custom" : "16:9");+ if (custom)+ (vm.CustomWidth, vm.CustomHeight) = (4, 5);+ else+ vm.SwapOrientation();+ ClickPerspective(window);+ window.CropCanvas.NormalizedCorners = new CropQuad(new Point(0.2, 0.1), new Point(0.8, 0.1), new Point(0.8, 0.9), new Point(0.2, 0.9));+ var size = CropMath.PerspectiveSize(window.CropCanvas.NormalizedCorners, 1600, 1000);+ var folder = (string)window.Tag!;+ Assert.True(vm.IsPerspectiveOn);+ await vm.CropAndSaveAsync();+ Pump();+ using (var output = new MagickImage(Path.Combine(folder, "harbour_cropped.jpg")))+ Assert.Equal(((uint)size.Width, (uint)size.Height), (output.Width, output.Height));+ ClickPerspective(window);+ AssertClose(CropMath.Centered(custom ? 4.0 / 5 : 9.0 / 16, 1000, 1600), window.CropCanvas.NormalizedCropRect);+ Assert.Equal(custom ? "custom" : "16:9", vm.SelectedAspect);+ Assert.Equal(!custom, vm.IsPortrait);+ if (custom)+ Assert.Equal((4, 5), (vm.CustomWidth, vm.CustomHeight));+ });+ }+ }++ [AvaloniaFact]+ public async Task A_batch_in_perspective_keeps_it_on_with_fresh_corners_and_the_usual_outcomes()+ {+ await WithOverlayAsync("en", false, ["one.jpg", "tall.jpg", "five.jpg", "spinner.gif", "three.jpg", "four.jpg"], async (window, vm, _) =>+ {+ ClickPerspective(window);+ await vm.CropAndSaveAsync();+ Pump();+ Assert.True(window.CropCanvas.IsPerspective);+ Assert.Equal(CropQuad.Full, window.CropCanvas.NormalizedCorners);+ Assert.Equal("1000 × 1600 px", vm.DimensionsText);+ for (var i = 0; i < 4; i++)+ {+ var p = window.CropCanvas.CornerScreenPoint(i);+ Assert.Equal(p.X, Avalonia.Controls.Canvas.GetLeft(CornerButtons(window)[i]) + 12, 1);+ Assert.Equal(p.Y, Avalonia.Controls.Canvas.GetTop(CornerButtons(window)[i]) + 12, 1);+ }+ window.CropCanvas.NormalizedCorners = CropQuad.Full.With(0, new Point(0.2, 0.1));+ await vm.CropAndSaveAsync();+ Pump();+ Assert.Equal(2, vm.CurrentIndex);+ Assert.Equal(CropQuad.Full, window.CropCanvas.NormalizedCorners);+ await vm.CropAndSaveAsync();+ Pump();+ Assert.Equal(4, vm.CurrentIndex);+ Assert.Equal(CropItemState.Failed, vm.Queue[3].State);+ var loc = AppHost.Get<ILocalizer>();+ Assert.Contains($"spinner.gif: {loc["error.unsupported_source"]}", vm.Problems);+ await vm.CropAndSaveAsync();+ Assert.Equal(CropItemState.Skipped, vm.Queue[4].State);+ Assert.Contains($"three.jpg: {loc["toast.skipped"]}", vm.Problems);+ await vm.SkipAsync();+ Assert.True(vm.IsFinished);+ Assert.Equal([CropItemState.Done, CropItemState.Done, CropItemState.Done, CropItemState.Failed, CropItemState.Skipped, CropItemState.Skipped],+ vm.Queue.Select(q => q.State));+ Assert.Equal((3, 2, 1), (vm.DoneCount, vm.SkippedCount, vm.FailedCount));+ Assert.Equal(loc.Format("toast.done_errors", 1, 6), vm.Summary);+ }, preset => preset.Output.Conflict = ConflictPolicy.Skip,+ folder => Picture(folder, "three_cropped.jpg"));+ }++ [AvaloniaFact]+ public async Task A_pdf_opens_rectangular_with_perspective_unavailable_and_it_comes_back()+ {+ await WithOverlayAsync("en", false, ["one.jpg", "pages.pdf", "two.jpg"], async (window, vm, _) =>+ {+ ClickPerspective(window);+ await vm.CropAndSaveAsync();+ Pump();+ var button = window.FindControl<ToggleButton>("PerspectiveButton")!;+ var loc = AppHost.Get<ILocalizer>();+ Assert.False(button.IsEnabled);+ Assert.Equal(loc["crop.perspective_pdf"], ToolTip.GetTip(button));+ Assert.False(window.CropCanvas.IsPerspective);+ var folder = (string)window.Tag!;+ await vm.CropAndSaveAsync();+ Pump();+ using var pdf = PdfReader.Open(Path.Combine(folder, "pages_cropped.pdf"), PdfDocumentOpenMode.Import);+ Assert.Equal(2, pdf.PageCount);+ Assert.True(window.CropCanvas.IsPerspective);+ Assert.True(button.IsEnabled);+ Assert.Equal(loc["crop.perspective_tip"], ToolTip.GetTip(button));+ Assert.True(CornerButtons(window)[window.CropCanvas.SelectedCorner].IsFocused);+ });+ }++ [AvaloniaFact]+ public async Task A_press_on_the_picture_away_from_the_corners_doesnt_move_the_window()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ ClickPerspective(window);+ var canvas = window.CropCanvas;+ var handled = new List<bool>();+ window.AddHandler(InputElement.PointerPressedEvent, (_, e) => handled.Add(e.Handled), RoutingStrategies.Bubble, handledEventsToo: true);+ var centre = canvas.TranslatePoint(canvas.CalculateImageBounds().Center, window)!.Value;+ window.MouseDown(centre, MouseButton.Left);+ window.MouseUp(centre, MouseButton.Left);+ Pump();+ Assert.Equal([true], handled);+ return Task.CompletedTask;+ });+ }++ [AvaloniaTheory]+ [InlineData("en")]+ [InlineData("ko")]+ [InlineData("ar")]+ public async Task Perspective_controls_are_named_and_placed_in_the_language(string language)+ {+ await WithOverlayAsync(language, false, ["harbour.jpg"], (window, vm, _) =>+ {+ ClickPerspective(window);+ var loc = AppHost.Get<ILocalizer>();+ Assert.Equal(loc["crop.perspective"], AutomationProperties.GetName(window.FindControl<ToggleButton>("PerspectiveButton")!));+ string[] keys = ["crop.corner_top_left", "crop.corner_top_right", "crop.corner_bottom_right", "crop.corner_bottom_left"];+ var canvas = window.CropCanvas;+ canvas.NormalizedCorners = CropQuad.Full.With(0, new Point(0.2, 0.1));+ Pump();+ for (var i = 0; i < 4; i++)+ {+ var button = CornerButtons(window)[i];+ Assert.Equal(loc[keys[i]], AutomationProperties.GetName(button));+ var actual = button.TranslatePoint(new Point(12, 12), window)!.Value;+ var expected = canvas.TranslatePoint(canvas.CornerScreenPoint(i), window)!.Value;+ Assert.InRange(Math.Abs(actual.X - expected.X), 0, 1);+ Assert.InRange(Math.Abs(actual.Y - expected.Y), 0, 1);+ }+ Assert.True(window.FindControl<TextBlock>("PerspectiveHint")!.IsEffectivelyVisible);+ Assert.False(window.FindControl<TextBlock>("RectangularHint")!.IsEffectivelyVisible);+ return Task.CompletedTask;+ });+ }++ [AvaloniaTheory]+ [InlineData("en", false)]+ [InlineData("en", true)]+ [InlineData("ko", false)]+ [InlineData("ko", true)]+ public async Task Perspective_mode_looks(string language, bool dark)+ {+ await WithOverlayAsync(language, dark, ["tilted.png"], (window, vm, suffix) =>+ {+ ClickPerspective(window);+ var q = new CropQuad(new Point(120.0 / 800, 80.0 / 600), new Point(690.0 / 800, 140.0 / 600),+ new Point(650.0 / 800, 520.0 / 600), new Point(90.0 / 800, 470.0 / 600));+ window.CropCanvas.NormalizedCorners = q;+ Settle(window);+ // Q's longer top and left edges, rounded: hypot(570, 60) and hypot(30, 390) on the 800 × 600 picture.+ Assert.Equal("573 × 391 px", vm.DimensionsText);+ Assert.True(window.FindControl<Avalonia.Controls.Canvas>("CornerLayer")!.IsEffectivelyVisible);+ Save(window, $"crop-perspective-{suffix}.png");+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task Turning_perspective_on_disables_the_dial_at_once_even_while_it_closes()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg"], (window, vm, _) =>+ {+ vm.SetAspect("4:3");+ vm.ToggleAspectDial();+ Pump();+ Assert.True(window.AspectDial.IsEffectivelyEnabled);+ vm.IsPerspective = true;+ Assert.False(window.AspectDial.IsEffectivelyEnabled);+ Assert.All(window.AspectDial.Segments, s => Assert.False(s.IsEffectivelyEnabled));+ var hubs = window.AspectDial.Children.OfType<Button>().Where(b => b.Classes.Contains("hub")).ToArray();+ Assert.Single(hubs);+ Assert.All(hubs, hub => Assert.False(hub.IsEffectivelyEnabled));+ Pump();+ Press(window, Key.Tab);+ Assert.False(window.AspectDial.IsKeyboardFocusWithin);+ return Task.CompletedTask;+ });+ }++ [AvaloniaFact]+ public async Task The_whole_toolbar_shows_in_the_smallest_window_with_a_custom_ratio_and_several_files()+ {+ await WithOverlayAsync("en", false, ["harbour.jpg", "two.jpg"], (window, vm, _) =>+ {+ vm.SetAspect("custom");+ (window.Width, window.Height) = (window.MinWidth, window.MinHeight);+ Settle(window);+ Assert.Equal(window.MinWidth, window.Bounds.Width);+ var toolbar = (StackPanel)window.FindControl<ToggleButton>("PerspectiveButton")!.Parent!;+ var pill = (Border)toolbar.Parent!;+ var loc = AppHost.Get<ILocalizer>();+ Control[] controls =+ [+ window.FindControl<Button>("DialButton")!, window.FindControl<ToggleButton>("PerspectiveButton")!,+ window.FindControl<NumericUpDown>("CustomWidthBox")!, window.FindControl<NumericUpDown>("CustomHeightBox")!,+ ..toolbar.Children.OfType<Button>().Where(b => AutomationProperties.GetName(b) is var name+ && (name == loc["crop.reset"] || name == loc["crop.skip"])),+ window.FindControl<Button>("PrimaryButton")!,+ ];+ Assert.Equal(7, controls.Length);+ var shell = new Rect(pill.TranslatePoint(default, window)!.Value, pill.Bounds.Size);+ foreach (var control in controls)+ {+ Assert.True(control.IsEffectivelyVisible, control.Name);+ var bounds = new Rect(control.TranslatePoint(default, window)!.Value, control.Bounds.Size);+ Assert.True(shell.Contains(bounds), $"{control.Name ?? AutomationProperties.GetName(control)} {bounds} outside {shell}");+ }+ return Task.CompletedTask;+ });+ }++ private static void AssertForbiddenKind(string kind, CropQuad q)+ {+ static double Cross(Point a, Point b, Point c) => (b.X - a.X) * (c.Y - a.Y) - (b.Y - a.Y) * (c.X - a.X);+ static bool Intersects(Point a, Point b, Point c, Point d) =>+ Cross(a, b, c) * Cross(a, b, d) < 0 && Cross(c, d, a) * Cross(c, d, b) < 0;+ var turns = Enumerable.Range(0, 4).Select(i => Cross(q[i], q[(i + 1) % 4], q[(i + 2) % 4])).ToArray();+ switch (kind)+ {+ case "twisted":+ Assert.True(Intersects(q[0], q[1], q[2], q[3]) || Intersects(q[1], q[2], q[3], q[0]));+ break;+ case "concave":+ Assert.Single(turns, c => c < 0);+ break;+ case "line":+ Assert.Contains(0.0, turns);+ break;+ case "outside":+ Assert.True(q[0].X < 0 || q[0].X > 1600 || q[0].Y < 0 || q[0].Y > 1000);+ break;+ }+ }++ private static Button[] CornerButtons(CropOverlayWindow window) =>+ new[] { "CornerTopLeft", "CornerTopRight", "CornerBottomRight", "CornerBottomLeft" }+ .Select(name => window.FindControl<Button>(name)!).ToArray();++ private static void ClickPerspective(CropOverlayWindow window)+ {+ Pump();+ var button = window.FindControl<ToggleButton>("PerspectiveButton")!;+ var p = button.TranslatePoint(new Point(button.Bounds.Width / 2, button.Bounds.Height / 2), window)!.Value;+ window.MouseDown(p, MouseButton.Left);+ window.MouseUp(p, MouseButton.Left);+ window.MouseMove(new Point(30, window.Bounds.Height / 2));+ Pump();+ }++ private static void Drag(CropOverlayWindow window, Point start, Point target)+ {+ Pump();+ window.MouseDown(start, MouseButton.Left);+ window.MouseMove(target);+ window.MouseUp(target, MouseButton.Left);+ Pump();+ }+private static void AssertClose(Rect expected, Rect actual){Assert.Equal(expected.X, actual.X, 3);@@ -460,6 +1038,96 @@ public class CropOverlayTests// ───────────────────────── Helpers ─────────────────────────+ private static async Task UntilAsync(CropOverlayViewModel vm, Func<bool> condition)+ {+ var ready = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);+ void Changed(object? sender, PropertyChangedEventArgs e)+ {+ if (condition())+ ready.TrySetResult();+ }+ vm.PropertyChanged += Changed;+ try+ {+ Changed(vm, new PropertyChangedEventArgs(null));+ await ready.Task.WaitAsync(TimeSpan.FromSeconds(10));+ }+ finally+ {+ vm.PropertyChanged -= Changed;+ }+ }++ private static async Task WithOverlayAsync(string language, bool dark, string[] names,+ Func<CropOverlayWindow, CropOverlayViewModel, string, Task> act,+ Action<Preset>? configure = null, Action<string>? prepare = null)+ {+ TestServices.EnsureInitialized(language);+ var theme = AppHost.Get<ThemeService>();+ if (dark)+ theme.Apply(new ThemeSettings { Mode = ThemeMode.Dark }, language);+ var folder = Directory.CreateTempSubdirectory("filee-crop-perspective-").FullName;+ CropOverlayWindow? window = null;+ try+ {+ var files = names.Select(name =>+ {+ if (name == "tilted.png")+ return Tilted(folder, name);+ if (!name.EndsWith(".pdf", StringComparison.Ordinal))+ return Picture(folder, name);+ var path = Path.Combine(folder, name);+ using var document = new PdfDocument();+ foreach (var rotation in new[] { 0, 90 })+ {+ var page = document.AddPage();+ page.Width = PdfSharp.Drawing.XUnit.FromPoint(600);+ page.Height = PdfSharp.Drawing.XUnit.FromPoint(800);+ page.Rotate = rotation;+ }+ document.Save(path);+ return path;+ }).ToList();+ prepare?.Invoke(folder);+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-crop").Clone();+ configure?.Invoke(preset);+ var vm = new CropOverlayViewModel(files, preset, AppHost.Get<ILocalizer>(), AppHost.Get<UserDataStore>());+ window = new CropOverlayWindow { DataContext = vm, Width = 1040, Height = 720, Tag = folder };+ window.Show();+ await UntilAsync(vm, () => vm.PreviewImage is not null && !vm.IsBusy);+ Pump();+ window.CropCanvas.FinishAnimations();+ await act(window, vm, $"{language}-{(dark ? "dark" : "light")}");+ }+ finally+ {+ if (window?.IsVisible == true)+ window.Close();+ if (dark)+ theme.Apply(new ThemeSettings(), language);+ try { Directory.Delete(folder, true); } catch (IOException) { }+ }+ }++ private static string Tilted(string folder, string name)+ {+ var path = Path.Combine(folder, name);+ using var image = new MagickImage(MagickColors.Red, 400, 300);+ using (var green = new MagickImage(MagickColors.Lime, 200, 150))+ image.Composite(green, 200, 0, CompositeOperator.Over);+ using (var blue = new MagickImage(MagickColors.Blue, 200, 150))+ image.Composite(blue, 200, 150, CompositeOperator.Over);+ using (var yellow = new MagickImage(MagickColors.Yellow, 200, 150))+ image.Composite(yellow, 0, 150, CompositeOperator.Over);+ image.BackgroundColor = MagickColors.Gray;+ image.VirtualPixelMethod = VirtualPixelMethod.Background;+ image.Distort(new DistortSettings(DistortMethod.Perspective) { Viewport = new MagickGeometry(0, 0, 800, 600) },+ [0, 0, 120, 80, 400, 0, 690, 140, 400, 300, 650, 520, 0, 300, 90, 470]);+ image.ResetPage();+ image.Write(path, MagickFormat.Png);+ return path;+ }+private static void WithOverlay(string language, bool dark, string[] names, Action<CropOverlayWindow, CropOverlayViewModel, string> act){TestServices.EnsureInitialized(language);diff --git a/tests/Filee.App.Tests/CropServiceTests.cs b/tests/Filee.App.Tests/CropServiceTests.csindex a8a8c24a..510d58ea 100644--- a/tests/Filee.App.Tests/CropServiceTests.cs+++ b/tests/Filee.App.Tests/CropServiceTests.cs@@ -1,8 +1,10 @@// Tests for CropService and the crop overlay: output resolving, conflict policies, quality, failures and skips.using System.IO;+using Avalonia;using Avalonia.Headless.XUnit;using Avalonia.Threading;+using Filee.App.Controls;using Filee.App.Services;using Filee.App.ViewModels;using Filee.Core.Conversion;@@ -18,6 +20,165 @@ namespace Filee.App.Tests;public class CropServiceTests{+ private static readonly CropQuad TiltedCorners = new(+ new Point(120.0 / 800, 80.0 / 600), new Point(690.0 / 800, 140.0 / 600),+ new Point(650.0 / 800, 520.0 / 600), new Point(90.0 / 800, 470.0 / 600));++ private static string Tilted(string folder, string name, bool oriented = false)+ {+ var path = Path.Combine(folder, name);+ using var image = new MagickImage(MagickColors.Red, 400, 300);+ using (var green = new MagickImage(MagickColors.Lime, 200, 150))+ image.Composite(green, 200, 0, CompositeOperator.Over);+ using (var blue = new MagickImage(MagickColors.Blue, 200, 150))+ image.Composite(blue, 200, 150, CompositeOperator.Over);+ using (var yellow = new MagickImage(MagickColors.Yellow, 200, 150))+ image.Composite(yellow, 0, 150, CompositeOperator.Over);+ image.BackgroundColor = MagickColors.Gray;+ image.VirtualPixelMethod = VirtualPixelMethod.Background;+ image.Distort(new DistortSettings(DistortMethod.Perspective) { Viewport = new MagickGeometry(0, 0, 800, 600) },+ [0, 0, 120, 80, 400, 0, 690, 140, 400, 300, 650, 520, 0, 300, 90, 470]);+ image.ResetPage();+ if (oriented)+ {+ image.Rotate(-90);+ var exif = new ExifProfile();+ exif.SetValue(ExifTag.Orientation, (ushort)6);+ image.SetProfile(exif);+ image.Orientation = OrientationType.RightTop;+ image.Quality = 95;+ }+ image.Write(path);+ return path;+ }++ private static void AssertColour(MagickImage image, int x, int y, IMagickColor<byte> expected)+ {+ using var pixels = image.GetPixels();+ var actual = pixels.GetPixel(x, y).ToColor()!;+ Assert.InRange(Math.Abs(actual.R - expected.R), 0, 30);+ Assert.InRange(Math.Abs(actual.G - expected.G), 0, 30);+ Assert.InRange(Math.Abs(actual.B - expected.B), 0, 30);+ }++ private static void AssertQuadrants(MagickImage image)+ {+ Assert.Equal(573u, image.Width);+ Assert.Equal(391u, image.Height);+ foreach (var (x, y, colour) in new[]+ {+ (0.1, 0.1, MagickColors.Red), (0.9, 0.1, MagickColors.Lime),+ (0.9, 0.9, MagickColors.Blue), (0.1, 0.9, MagickColors.Yellow),+ (0.45, 0.45, MagickColors.Red), (0.55, 0.45, MagickColors.Lime),+ (0.55, 0.55, MagickColors.Blue), (0.45, 0.55, MagickColors.Yellow),+ })+ AssertColour(image, (int)(x * (image.Width - 1)), (int)(y * (image.Height - 1)), colour);+ }++ [AvaloniaFact]+ public async Task A_perspective_crop_straightens_a_tilted_picture()+ {+ TestServices.EnsureInitialized("en");+ var folder = Directory.CreateTempSubdirectory("filee-perspective-").FullName;+ try+ {+ var source = Tilted(folder, "tilted.png");+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-crop");+ var result = await CropService.CropFileAsync(source, 0, 0, 800, 600, preset,+ AppHost.Get<UserDataStore>(), AppHost.Get<ILocalizer>(), corners: TiltedCorners);+ Assert.Equal(CropStatus.Success, result.Status);+ Assert.EndsWith("tilted_cropped.png", result.OutputPath);+ using var image = new MagickImage(result.OutputPath!);+ Assert.Equal(MagickFormat.Png, image.Format);+ AssertQuadrants(image);+ }+ finally+ {+ try { Directory.Delete(folder, true); } catch (IOException) { }+ }+ }++ [AvaloniaFact]+ public async Task A_perspective_crop_follows_the_pictures_orientation()+ {+ TestServices.EnsureInitialized("en");+ var folder = Directory.CreateTempSubdirectory("filee-perspective-orientation-").FullName;+ try+ {+ var source = Tilted(folder, "tilted.jpg", oriented: true);+ var preview = await CropService.LoadPreviewAsync(source);+ using (preview.Bitmap)+ {+ Assert.Equal(800, preview.Width);+ Assert.Equal(600, preview.Height);+ }+ using (var oriented = new MagickImage(source))+ {+ Assert.Equal(600u, oriented.Width);+ Assert.Equal(800u, oriented.Height);+ oriented.AutoOrient();+ AssertColour(oriented, 160, 120, MagickColors.Red);+ }+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-crop");+ var result = await CropService.CropFileAsync(source, 0, 0, 800, 600, preset,+ AppHost.Get<UserDataStore>(), AppHost.Get<ILocalizer>(), corners: TiltedCorners);+ Assert.Equal(CropStatus.Success, result.Status);+ using var image = new MagickImage(result.OutputPath!);+ AssertQuadrants(image);+ }+ finally+ {+ try { Directory.Delete(folder, true); } catch (IOException) { }+ }+ }++ [AvaloniaFact]+ public async Task A_perspective_crop_keeps_quality_dates_and_the_conflict_policy()+ {+ TestServices.EnsureInitialized("en");+ var folder = Directory.CreateTempSubdirectory("filee-perspective-quality-").FullName;+ try+ {+ var store = AppHost.Get<UserDataStore>();+ var loc = AppHost.Get<ILocalizer>();+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-crop").Clone();+ preset.Output.KeepDates = true;+ var jpeg = Path.Combine(folder, "photo.jpg");+ using (var image = new MagickImage("plasma:", 120, 90))+ {+ image.Quality = 75;+ image.Write(jpeg, MagickFormat.Jpeg);+ }+ File.SetLastWriteTimeUtc(jpeg, new DateTime(2020, 1, 2, 3, 4, 5, DateTimeKind.Utc));+ var jpegResult = await CropService.CropFileAsync(jpeg, 0, 0, 120, 90, preset, store, loc, corners: CropQuad.Full);+ Assert.Equal(CropStatus.Success, jpegResult.Status);+ using (var cropped = new MagickImage(jpegResult.OutputPath!))+ Assert.InRange(cropped.Quality, 73u, 77u);+ Assert.Equal(File.GetLastWriteTimeUtc(jpeg), File.GetLastWriteTimeUtc(jpegResult.OutputPath!));++ var webp = Path.Combine(folder, "logo.webp");+ using (var image = new MagickImage("plasma:", 120, 90))+ {+ image.Settings.SetDefine(MagickFormat.WebP, "lossless", true);+ image.Write(webp, MagickFormat.WebP);+ }+ Assert.True(IsLosslessWebp(webp));+ var webpResult = await CropService.CropFileAsync(webp, 0, 0, 120, 90, preset, store, loc, corners: CropQuad.Full);+ Assert.Equal(CropStatus.Success, webpResult.Status);+ Assert.True(IsLosslessWebp(webpResult.OutputPath!));++ var existing = File.ReadAllBytes(jpegResult.OutputPath!);+ preset.Output.Conflict = ConflictPolicy.Skip;+ var skipped = await CropService.CropFileAsync(jpeg, 0, 0, 120, 90, preset, store, loc, corners: CropQuad.Full);+ Assert.Equal(CropStatus.SkippedExists, skipped.Status);+ Assert.Equal(existing, File.ReadAllBytes(jpegResult.OutputPath!));+ }+ finally+ {+ try { Directory.Delete(folder, true); } catch (IOException) { }+ }+ }+private static string CreateTestImage(string folder, string name, int width = 100, int height = 80){var path = Path.Combine(folder, name);