Skip to content

armgit / Filee

Public Imported from GitHub
0

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.

Donut: draw the flip arrow in the hub hint, not a character (#554) (#609)

Cre8ive Marketing34a854bf160d
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index b3951e3d..736a8dfd 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -132,7 +132,7 @@ vertical axis in 200 ms, an open group's ring folding first, and halfway, edge-o
`RadialViewModel` show the other face, so slices, hit tests and drops always belong to the face that is drawn.
*Reduce animations* swaps the faces at once. `RadialViewModel` builds both faces with the same `PresetAvailability`
check (the back right after the front is on screen); a face with no slice for the files (or none at all) isn't
-flipped to, and only then does the hub leave out its "Tab ↻ back" hint (a mouse in place of the key when only the
+flipped to, and only then does the hub leave out its "⟳ Tab back" hint (a mouse in place of the key when only the
wheel flips). In click mode the focused window gets the key (`DonutMenu.HandleKey`) and the donut the wheel. During a
drag the donut's window has no keyboard focus, so `RadialController` turns on `TriggerService.WatchFlipKey` while
the drag donut shows files and flips on `FlipKeyPressed` / `FlipWheelTurned`: the global hook only listens (it
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.json
index 3eacdea4..ab07dfc2 100644
--- a/src/Filee.App/Assets/i18n/ar.json
+++ b/src/Filee.App/Assets/i18n/ar.json
@@ -62,8 +62,8 @@
"donut.empty": "اسحب الإعدادات المسبقة إلى هنا",
"donut.same_format": "الصيغة نفسها",
"donut.group_caption": "مجموعة من {0}",
- "donut.flip_to_back": "{0} ↻ الخلف",
- "donut.flip_to_front": "{0} ↻ الأمام",
+ "donut.flip_to_back": "{0} الخلف",
+ "donut.flip_to_front": "{0} الأمام",
"toast.converting": "تحويل {0} إلى {1}",
"toast.done": "اكتمل",
"toast.done_errors": "فشل {0} من أصل {1}",
diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.json
index 022a6164..436b9cc1 100644
--- a/src/Filee.App/Assets/i18n/de.json
+++ b/src/Filee.App/Assets/i18n/de.json
@@ -62,8 +62,8 @@
"donut.empty": "Vorlagen hierher ziehen",
"donut.same_format": "Gleiches Format",
"donut.group_caption": "Gruppe mit {0}",
- "donut.flip_to_back": "{0} ↻ Rückseite",
- "donut.flip_to_front": "{0} ↻ Vorderseite",
+ "donut.flip_to_back": "{0} Rückseite",
+ "donut.flip_to_front": "{0} Vorderseite",
"toast.converting": "{0} → {1}",
"toast.done": "Fertig",
"toast.done_errors": "{0} von {1} fehlgeschlagen",
diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.json
index 6ece0638..5fd3954a 100644
--- a/src/Filee.App/Assets/i18n/en.json
+++ b/src/Filee.App/Assets/i18n/en.json
@@ -66,8 +66,8 @@
"donut.empty": "Drag presets here",
"donut.same_format": "Same format",
"donut.group_caption": "Group of {0}",
- "donut.flip_to_back": "{0} ↻ back",
- "donut.flip_to_front": "{0} ↻ front",
+ "donut.flip_to_back": "{0} back",
+ "donut.flip_to_front": "{0} front",
"toast.converting": "{0} → {1}",
"toast.done": "Done",
diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.json
index 8d34dfcf..ae43cfef 100644
--- a/src/Filee.App/Assets/i18n/es.json
+++ b/src/Filee.App/Assets/i18n/es.json
@@ -62,8 +62,8 @@
"donut.empty": "Arrastra ajustes preestablecidos aquí",
"donut.same_format": "Mismo formato",
"donut.group_caption": "Grupo de {0}",
- "donut.flip_to_back": "{0} ↻ reverso",
- "donut.flip_to_front": "{0} ↻ anverso",
+ "donut.flip_to_back": "{0} reverso",
+ "donut.flip_to_front": "{0} anverso",
"toast.converting": "{0} → {1}",
"toast.done": "Hecho",
"toast.done_errors": "Fallaron {0} de {1}",
diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.json
index 9d89e5bf..d91360e1 100644
--- a/src/Filee.App/Assets/i18n/fr.json
+++ b/src/Filee.App/Assets/i18n/fr.json
@@ -66,8 +66,8 @@
"donut.empty": "Glissez des préréglages ici",
"donut.same_format": "Inchangé",
"donut.group_caption": "{0} options",
- "donut.flip_to_back": "{0} ↻ verso",
- "donut.flip_to_front": "{0} ↻ recto",
+ "donut.flip_to_back": "{0} verso",
+ "donut.flip_to_front": "{0} recto",
"toast.converting": "{0} → {1}",
"toast.done": "Terminé",
diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.json
index 431d514a..fa612926 100644
--- a/src/Filee.App/Assets/i18n/hi.json
+++ b/src/Filee.App/Assets/i18n/hi.json
@@ -62,8 +62,8 @@
"donut.empty": "प्रीसेट यहाँ खींचें",
"donut.same_format": "वही फ़ॉर्मैट",
"donut.group_caption": "{0} का समूह",
- "donut.flip_to_back": "{0} ↻ पीछे",
- "donut.flip_to_front": "{0} ↻ आगे",
+ "donut.flip_to_back": "{0} पीछे",
+ "donut.flip_to_front": "{0} आगे",
"toast.converting": "{0} → {1}",
"toast.done": "हो गया",
"toast.done_errors": "{1} में से {0} विफल",
diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.json
index a3411659..7fadc185 100644
--- a/src/Filee.App/Assets/i18n/ja.json
+++ b/src/Filee.App/Assets/i18n/ja.json
@@ -62,8 +62,8 @@
"donut.empty": "ここにプリセットをドラッグ",
"donut.same_format": "同じ形式",
"donut.group_caption": "{0}個入り",
- "donut.flip_to_back": "{0} ↻ 裏面",
- "donut.flip_to_front": "{0} ↻ 表面",
+ "donut.flip_to_back": "{0} 裏面",
+ "donut.flip_to_front": "{0} 表面",
"toast.converting": "{0} → {1}",
"toast.done": "完了",
"toast.done_errors": "{1}件中{0}件失敗",
diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.json
index 46ccf6cc..e81e22da 100644
--- a/src/Filee.App/Assets/i18n/ko.json
+++ b/src/Filee.App/Assets/i18n/ko.json
@@ -66,8 +66,8 @@
"donut.empty": "프리셋을 끌어다 놓으세요",
"donut.same_format": "같은 형식",
"donut.group_caption": "묶음 · {0}개",
- "donut.flip_to_back": "{0} ↻ 뒷면",
- "donut.flip_to_front": "{0} ↻ 앞면",
+ "donut.flip_to_back": "{0} 뒷면",
+ "donut.flip_to_front": "{0} 앞면",
"toast.converting": "{0} → {1}",
"toast.done": "완료",
diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.json
index a891cba3..c258c7e9 100644
--- a/src/Filee.App/Assets/i18n/ne.json
+++ b/src/Filee.App/Assets/i18n/ne.json
@@ -62,8 +62,8 @@
"donut.empty": "प्रिसेटहरू यहाँ तान्नुहोस्",
"donut.same_format": "उही ढाँचा",
"donut.group_caption": "{0} को समूह",
- "donut.flip_to_back": "{0} ↻ पछाडि",
- "donut.flip_to_front": "{0} ↻ अगाडि",
+ "donut.flip_to_back": "{0} पछाडि",
+ "donut.flip_to_front": "{0} अगाडि",
"toast.converting": "{0} → {1}",
"toast.done": "सम्पन्न भयो",
"toast.done_errors": "{1} मध्ये {0} असफल भयो",
diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.json
index e350005d..8ce69b4b 100644
--- a/src/Filee.App/Assets/i18n/pl.json
+++ b/src/Filee.App/Assets/i18n/pl.json
@@ -66,8 +66,8 @@
"donut.empty": "Przeciągnij tu ustawienia",
"donut.same_format": "Ten sam format",
"donut.group_caption": "Grupa: {0}",
- "donut.flip_to_back": "{0} ↻ tył",
- "donut.flip_to_front": "{0} ↻ przód",
+ "donut.flip_to_back": "{0} tył",
+ "donut.flip_to_front": "{0} przód",
"toast.converting": "{0} → {1}",
"toast.done": "Gotowe",
diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.json
index c5a198ff..1292206f 100644
--- a/src/Filee.App/Assets/i18n/pt-BR.json
+++ b/src/Filee.App/Assets/i18n/pt-BR.json
@@ -66,8 +66,8 @@
"donut.empty": "Arraste predefinições para cá",
"donut.same_format": "Mesmo formato",
"donut.group_caption": "Grupo de {0}",
- "donut.flip_to_back": "{0} ↻ verso",
- "donut.flip_to_front": "{0} ↻ frente",
+ "donut.flip_to_back": "{0} verso",
+ "donut.flip_to_front": "{0} frente",
"toast.converting": "{0} → {1}",
"toast.done": "Concluído",
diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.json
index 9752ee85..48563251 100644
--- a/src/Filee.App/Assets/i18n/pt-PT.json
+++ b/src/Filee.App/Assets/i18n/pt-PT.json
@@ -66,8 +66,8 @@
"donut.empty": "Arrasta predefinições para aqui",
"donut.same_format": "Mesmo formato",
"donut.group_caption": "Grupo de {0}",
- "donut.flip_to_back": "{0} ↻ verso",
- "donut.flip_to_front": "{0} ↻ frente",
+ "donut.flip_to_back": "{0} verso",
+ "donut.flip_to_front": "{0} frente",
"toast.converting": "{0} → {1}",
"toast.done": "Concluído",
diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.json
index 8f9feddc..62243b38 100644
--- a/src/Filee.App/Assets/i18n/ru.json
+++ b/src/Filee.App/Assets/i18n/ru.json
@@ -66,8 +66,8 @@
"donut.empty": "Перетащите пресеты сюда",
"donut.same_format": "Тот же формат",
"donut.group_caption": "Группа: {0}",
- "donut.flip_to_back": "{0} ↻ оборот",
- "donut.flip_to_front": "{0} ↻ лицо",
+ "donut.flip_to_back": "{0} оборот",
+ "donut.flip_to_front": "{0} лицо",
"toast.converting": "{0} → {1}",
"toast.done": "Готово",
diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.json
index c186c2b0..dcadcb3e 100644
--- a/src/Filee.App/Assets/i18n/th.json
+++ b/src/Filee.App/Assets/i18n/th.json
@@ -62,8 +62,8 @@
"donut.empty": "ลากพรีเซ็ตมาที่นี่",
"donut.same_format": "ฟอร์แมตเดิม",
"donut.group_caption": "กลุ่ม {0}",
- "donut.flip_to_back": "{0} ↻ ด้านหลัง",
- "donut.flip_to_front": "{0} ↻ ด้านหน้า",
+ "donut.flip_to_back": "{0} ด้านหลัง",
+ "donut.flip_to_front": "{0} ด้านหน้า",
"toast.converting": "{0} → {1}",
"toast.done": "เสร็จสิ้น",
"toast.done_errors": "ล้มเหลว {0} จาก {1} ไฟล์",
diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.json
index 5d85ce3f..88cf7430 100644
--- a/src/Filee.App/Assets/i18n/tr.json
+++ b/src/Filee.App/Assets/i18n/tr.json
@@ -62,8 +62,8 @@
"donut.empty": "Ön ayarları buraya sürükleyin",
"donut.same_format": "Aynı biçim",
"donut.group_caption": "{0} öğelik grup",
- "donut.flip_to_back": "{0} ↻ arka",
- "donut.flip_to_front": "{0} ↻ ön",
+ "donut.flip_to_back": "{0} arka",
+ "donut.flip_to_front": "{0} ön",
"toast.converting": "{0} → {1}",
"toast.done": "Tamamlandı",
"toast.done_errors": "{1} dosyadan {0} tanesi başarısız",
diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.json
index 45f8b7d4..9b8cefcd 100644
--- a/src/Filee.App/Assets/i18n/zh-CN.json
+++ b/src/Filee.App/Assets/i18n/zh-CN.json
@@ -66,8 +66,8 @@
"donut.empty": "把预设拖到这里",
"donut.same_format": "同格式",
"donut.group_caption": "组 · {0} 项",
- "donut.flip_to_back": "{0} ↻ 背面",
- "donut.flip_to_front": "{0} ↻ 正面",
+ "donut.flip_to_back": "{0} 背面",
+ "donut.flip_to_front": "{0} 正面",
"toast.converting": "{0} → {1}",
"toast.done": "完成",
diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.json
index 78743df1..aa55dc24 100644
--- a/src/Filee.App/Assets/i18n/zh-TW.json
+++ b/src/Filee.App/Assets/i18n/zh-TW.json
@@ -66,8 +66,8 @@
"donut.empty": "把預設拖到這裡",
"donut.same_format": "同格式",
"donut.group_caption": "群組 · {0} 個項目",
- "donut.flip_to_back": "{0} ↻ 背面",
- "donut.flip_to_front": "{0} ↻ 正面",
+ "donut.flip_to_back": "{0} 背面",
+ "donut.flip_to_front": "{0} 正面",
"toast.converting": "{0} → {1}",
"toast.done": "完成",
diff --git a/src/Filee.App/Controls/DonutMenu.Flip.cs b/src/Filee.App/Controls/DonutMenu.Flip.cs
index 5024cf9a..691d3083 100644
--- a/src/Filee.App/Controls/DonutMenu.Flip.cs
+++ b/src/Filee.App/Controls/DonutMenu.Flip.cs
@@ -1,6 +1,6 @@
// Flipping the donut to its other face: every profile has a front and a back list of slices, and Tab turns the open
// donut over. Each slice folds about its spoke, starting under the pointer and spreading both ways; the hub stays
-// where it is and says how to flip ("Tab ↻ back").
+// where it is and says how to flip ("⟳ Tab back").
//
// The flip key (Tab unless the user records another in Settings → Shortcuts) and the mouse wheel flip it:
// Click mode → the key reaches the focused window (HandleKey), the wheel the donut (OnPointerWheelChanged).
@@ -23,7 +23,7 @@ public sealed partial class DonutMenu
public static readonly StyledProperty<bool> CanFlipProperty =
AvaloniaProperty.Register<DonutMenu, bool>(nameof(CanFlip));
- /// <summary>Small line at the bottom of the hub, e.g. "Tab ↻ back" (null for none).</summary>
+ /// <summary>Small line at the bottom of the hub, e.g. "⟳ Tab back" (null for none).</summary>
public static readonly StyledProperty<string?> CenterHintProperty =
AvaloniaProperty.Register<DonutMenu, string?>(nameof(CenterHint));
diff --git a/src/Filee.App/Controls/DonutMenu.cs b/src/Filee.App/Controls/DonutMenu.cs
index b7f16df7..d26a890e 100644
--- a/src/Filee.App/Controls/DonutMenu.cs
+++ b/src/Filee.App/Controls/DonutMenu.cs
@@ -953,8 +953,9 @@ public sealed partial class DonutMenu : Control
var maxWidth = radius * 1.6;
var title = MakeText(CenterTitle ?? "", bold, 14, Foreground, maxWidth, maxLines: 2);
var subtitle = MakeText(CenterSubtitle ?? "", regular, 11.5, cancelHot ? DangerBrush : SecondaryForeground, maxWidth, maxLines: 2);
- // "Tab ↻ back": small, under the rest, a little narrower (the hub is round).
- var hint = string.IsNullOrEmpty(CenterHint) ? null : MakeText(CenterHint, regular, 10.5, SecondaryForeground, maxWidth * 0.85);
+ // "⟳ Tab back": small, under the rest, a little narrower (the hub is round), with room for its icons.
+ var hintIcons = FlipArrowSize + (CenterHintWheel ? MouseWidth + MouseGap : 0) + IconGap;
+ var hint = string.IsNullOrEmpty(CenterHint) ? null : MakeText(CenterHint, regular, 10.5, SecondaryForeground, maxWidth * 0.85 - hintIcons);
var total = title.Height + (string.IsNullOrEmpty(CenterSubtitle) ? 0 : subtitle.Height + 2) + (hint is null ? 0 : hint.Height + 5);
var y = center.Y - total / 2;
DrawCentered(context, title, center.X, y);
@@ -968,22 +969,64 @@ public sealed partial class DonutMenu : Control
{
using (context.PushOpacity(0.85))
{
- if (!CenterHintWheel)
+ // The flip arrow is drawn, not typed: a font without "↻" showed a box in its place (#554). A small mouse
+ // comes first when the wheel flips and no key does. The icons stand at the start of the line: on its
+ // left, or on its right in a right-to-left language, in reading order there too.
+ var left = center.X - (hintIcons + hint.Width) / 2;
+ var rtl = TextDirection == FlowDirection.RightToLeft;
+ var textLeft = rtl ? left : left + hintIcons;
+ var middle = y + 5 + hint.Height / 2;
+ var x = rtl ? left + hint.Width + IconGap : left;
+ var arrowFirst = rtl && CenterHintWheel;
+ if (CenterHintWheel && !arrowFirst)
{
- DrawCentered(context, hint, center.X, y + 5);
- }
- else
- {
- // A small mouse in front: "🖱 ↻ back" when the wheel flips and no key does.
- const double iconWidth = 7, gap = 4;
- var left = center.X - (hint.Width + iconWidth + gap) / 2;
- DrawMouse(context, new Rect(left, y + 5 + (hint.Height - 10) / 2, iconWidth, 10), SecondaryForeground);
- DrawCentered(context, hint, center.X + (iconWidth + gap) / 2, y + 5);
+ DrawMouse(context, new Rect(x, middle - 5, MouseWidth, 10), SecondaryForeground);
+ x += MouseWidth + MouseGap;
}
+ DrawFlipArrow(context, new Point(x + FlipArrowSize / 2, middle), FlipArrowSize / 2, SecondaryForeground);
+ x += FlipArrowSize + (arrowFirst ? MouseGap : IconGap);
+ if (arrowFirst)
+ DrawMouse(context, new Rect(x, middle - 5, MouseWidth, 10), SecondaryForeground);
+ DrawCentered(context, hint, textLeft + hint.Width / 2, y + 5);
}
}
}
+ // The hub hint's icons: the flip arrow, the mouse (wheel only) and the room between them and before the text. The
+ // arrow's head reaches a little past its circle towards the mouse, so that gap is wider.
+ private const double FlipArrowSize = 9, MouseWidth = 7, IconGap = 4, MouseGap = 6;
+
+ /// <summary>
+ /// A small arrow turning clockwise round <paramref name="center"/>, the "flip" in the hub hint: most of a circle with
+ /// its head at the end.
+ /// </summary>
+ internal static void DrawFlipArrow(DrawingContext context, Point center, double radius, IBrush? brush)
+ {
+ var pen = new Pen(brush, 1.2, lineCap: PenLineCap.Round, lineJoin: PenLineJoin.Round);
+ // Angles in radians from 3 o'clock, growing clockwise on screen (y points down). From 1 o'clock almost round to
+ // 11 o'clock, leaving a gap at the top where the head points into.
+ const double start = -Math.PI / 3, sweep = Math.PI * 5 / 3;
+ Point At(double angle) => new(center.X + radius * Math.Cos(angle), center.Y + radius * Math.Sin(angle));
+ var end = start + sweep;
+ var arc = new StreamGeometry();
+ using (var g = arc.Open())
+ {
+ g.BeginFigure(At(start), false);
+ g.ArcTo(At(end), new Size(radius, radius), 0, sweep > Math.PI, SweepDirection.Clockwise);
+ g.EndFigure(false);
+ }
+ context.DrawGeometry(null, pen, arc);
+
+ // The head: two strokes back from the end, along the circle's tangent there and either side of it.
+ var tip = At(end);
+ var along = new Vector(-Math.Sin(end), Math.Cos(end)); // clockwise
+ var outward = new Vector(Math.Cos(end), Math.Sin(end));
+ var head = radius * 0.75;
+ var back = tip - along * head;
+ context.DrawLine(pen, back + outward * head * 0.6, tip);
+ context.DrawLine(pen, back - outward * head * 0.6, tip);
+ }
+
/// <summary>An outline of a mouse with its wheel, filling <paramref name="box"/>.</summary>
private static void DrawMouse(DrawingContext context, Rect box, IBrush? brush)
{
diff --git a/src/Filee.App/ViewModels/RadialViewModel.cs b/src/Filee.App/ViewModels/RadialViewModel.cs
index 62199fad..d03efe10 100644
--- a/src/Filee.App/ViewModels/RadialViewModel.cs
+++ b/src/Filee.App/ViewModels/RadialViewModel.cs
@@ -29,7 +29,7 @@ public sealed partial class RadialViewModel(UserDataStore store, ILocalizer loc,
[ObservableProperty] private bool _canFlip;
/// <summary>
- /// "Tab ↻ back" / "Tab ↻ front" in the hub (with the flip key of the settings) while <see cref="CanFlip"/> and a key
+ /// "⟳ Tab back" / "⟳ Tab front" (the arrow drawn, #554) in the hub (with the flip key of the settings) while <see cref="CanFlip"/> and a key
/// or the wheel flips; else null.
/// </summary>
[ObservableProperty] private string? _flipHint;
diff --git a/tests/Filee.App.Tests/DonutFlipTests.cs b/tests/Filee.App.Tests/DonutFlipTests.cs
index 48aded67..e0b10544 100644
--- a/tests/Filee.App.Tests/DonutFlipTests.cs
+++ b/tests/Filee.App.Tests/DonutFlipTests.cs
@@ -904,10 +904,15 @@ public class DonutFlipTests
window.Close();
});
- /// <summary>No key, the wheel on: the hub shows a mouse; neither: no hint and the donut doesn't flip by input.</summary>
- [AvaloniaFact]
- public void The_hub_shows_a_mouse_when_only_the_wheel_flips_and_nothing_when_nothing_does() =>
- With(animations: false, back: null, flipKey: "", wheel: true, test: () =>
+ /// <summary>
+ /// No key, the wheel on: the hub shows a mouse and the flip arrow; neither: no hint and the donut doesn't flip by
+ /// input. Arabic puts the icons at the right, where its line starts (#554).
+ /// </summary>
+ [AvaloniaTheory]
+ [InlineData("en")]
+ [InlineData("ar")]
+ public void The_hub_shows_a_mouse_when_only_the_wheel_flips_and_nothing_when_nothing_does(string language) =>
+ With(animations: false, back: null, language: language, flipKey: "", wheel: true, test: () =>
{
var (vm, window, donut) = OpenClickMode();
Assert.Null(donut.FlipKey);
@@ -915,7 +920,7 @@ public class DonutFlipTests
Assert.Equal(AppHost.Get<ILocalizer>().Format("donut.flip_to_back", "").Trim(), vm.FlipHint);
Assert.False(donut.HandleKey(Key.Tab));
RenderTests.Pump();
- RenderTests.Save(window, "donut-front-hint-wheel-en.png");
+ RenderTests.Save(window, $"donut-front-hint-wheel-{language}.png");
window.Close();
Store.Settings.Donut.FlipWithWheel = false;
diff --git a/tests/Filee.App.Tests/LocalizationTests.cs b/tests/Filee.App.Tests/LocalizationTests.cs
index 7fa94d79..8a454a80 100644
--- a/tests/Filee.App.Tests/LocalizationTests.cs
+++ b/tests/Filee.App.Tests/LocalizationTests.cs
@@ -52,6 +52,22 @@ public partial class LocalizationTests
}
+ [Fact]
+ public void The_flip_hint_leaves_its_arrow_to_the_donut()
+ {
+ // The hub draws the arrow itself (#554): as a character, fonts without "↻" (Linux's bundled Noto Sans) showed
+ // a box. The key stays first, so every language still reads "Tab back".
+ foreach (var code in LocalizationService.Languages.Select(l => l.Code))
+ {
+ var strings = Load(code);
+ foreach (var key in new[] { "donut.flip_to_back", "donut.flip_to_front" })
+ {
+ Assert.DoesNotContain("↻", strings[key]);
+ Assert.StartsWith("{0} ", strings[key]);
+ }
+ }
+ }
+
[Theory]
[MemberData(nameof(Languages))]
public void Every_language_has_exactly_the_english_keys(string code)
diff --git a/tests/Filee.App.Tests/WhatsNewMedia.cs b/tests/Filee.App.Tests/WhatsNewMedia.cs
index 73474671..1d0fb71a 100644
--- a/tests/Filee.App.Tests/WhatsNewMedia.cs
+++ b/tests/Filee.App.Tests/WhatsNewMedia.cs
@@ -157,7 +157,7 @@ public class WhatsNewMedia
}
/// <summary>
- /// The donut's back face (#262): the images donut with "Tab ↻ back" in the hub turns over to its back face and,
+ /// The donut's back face (#262): the images donut with "⟳ Tab back" in the hub turns over to its back face and,
/// after a moment, to the front again.
/// </summary>
private static Clip DonutFlip()
@@ -171,7 +171,7 @@ public class WhatsNewMedia
Pump(); // the back face is checked once the front is on screen
Assert.True(vm.CanFlip);
Settle(donut);
- // Frame 0: the front with its "Tab ↻ back" hint.
+ // Frame 0: the front with its "⟳ Tab back" hint.
clip.Add(Capture(window), 1600);
for (var turn = 0; turn < 2; turn++)
{