Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

M16.1: complete navigation arrowheads

MusseJusse036993f19478
diff --git a/crates/ui-egui/src/icons.rs b/crates/ui-egui/src/icons.rs
index b4afd8c1b..acbbba02b 100644
--- a/crates/ui-egui/src/icons.rs
+++ b/crates/ui-egui/src/icons.rs
@@ -151,8 +151,14 @@ pub fn paint(p: &Painter, rect: Rect, icon: Icon, color: Color32) {
pen.rect(3.0, 4.0, 17.0, 16.0, 1.5);
pen.line(&[(8.0, 4.0), (8.0, 16.0)]);
}
- Back => pen.line(&[(16.0, 10.0), (4.0, 10.0), (9.0, 5.0)]),
- Forward => pen.line(&[(4.0, 10.0), (16.0, 10.0), (11.0, 5.0)]),
+ Back => {
+ pen.line(&[(16.0, 10.0), (4.0, 10.0)]);
+ pen.line(&[(9.0, 5.0), (4.0, 10.0), (9.0, 15.0)]);
+ }
+ Forward => {
+ pen.line(&[(4.0, 10.0), (16.0, 10.0)]);
+ pen.line(&[(11.0, 5.0), (16.0, 10.0), (11.0, 15.0)]);
+ }
Search => {
pen.circle(8.5, 8.5, 5.0);
pen.line(&[(12.2, 12.2), (16.5, 16.5)]);
@@ -479,3 +485,28 @@ pub fn paint(p: &Painter, rect: Rect, icon: Icon, color: Color32) {
}
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn navigation_arrowheads_have_both_halves() {
+ for icon in [Icon::Back, Icon::Forward] {
+ for scale in [1.0, 2.0] {
+ let mut view = crate::headless::HeadlessView::new();
+ let raw = crate::headless::HeadlessView::raw_input(vec2(64.0, 64.0), scale, 0.0, vec![]);
+ view.run(raw, |ui| {
+ ui.painter().rect_filled(ui.max_rect(), 0.0, Color32::BLACK);
+ paint(ui.painter(), Rect::from_center_size(pos2(32.0, 32.0), vec2(18.6, 18.6)), icon, Color32::WHITE);
+ });
+ let image = view.paint(&Default::default());
+ let middle = image.pixels.len() / 2;
+ let upper: u64 = image.pixels[..middle].iter().map(|p| u64::from(p.r())).sum();
+ let lower: u64 = image.pixels[middle..].iter().map(|p| u64::from(p.r())).sum();
+ assert!(upper > 0 && lower > 0, "the arrow must render");
+ assert!(upper.abs_diff(lower) < upper / 20, "arrowhead must be symmetric at scale {scale}: {upper} above, {lower} below");
+ }
+ }
+ }
+}
diff --git a/docs/parity.md b/docs/parity.md
index 827299711..741fd77da 100644
--- a/docs/parity.md
+++ b/docs/parity.md
@@ -696,7 +696,7 @@ From `06-shortcuts.md` part 1. Evidence is our binding; conflicts are explained
| KEY-SHORTCUTS | Shortcut list — ⌘/ | P1 | ✅ | `cmd:app.shortcuts` | |
| KEY-HELP | Help — F1 | P2 | ✅ | `cmd:app.help` | |
| KEY-VIDEO-PLAY | Play/pause video — Space | P1 | ⬜ | | |
-| KEY-ESC | Leave tool / view — Esc | P0 | ✅ | `cmd:view.back` | |
+| KEY-ESC | Leave tool / view — Esc | P0 | ✅ | `cmd:view.back`, `crates/ui-egui/src/icons.rs` (`navigation_arrowheads_have_both_halves`) | top-bar navigation arrowheads render both halves at 1× and 2× scale |
| KEY-COMMIT | Commit tool — Return | P1 | ✅ | `cmd:tool.done` | Return closes Crop / Remove / Red Eye / Masking back to Edit (edits apply live, as in Lightroom) |
| KEY-DELETE-PIN | Delete selected pin — ⌫ | P0 | ✅ | `cmd:mask.delete`, `cmd:spot.delete` | ⌫ deletes the active mask (Masking) or the selected spot (Remove), never the photo while retouching |
| KEY-HIDEPINS | Hide pins — H | P2 | ⬜ | | H = Remove panel |