Address review: crop key tests reach keys() past the default-frame guard

After #9855 crop_shield::keys returns early over the untouched default
frame, so the Shift+H/Shift+P and Alt-letter tests on crop_app() passed
without the fix. They now start a crop in progress (frame changed,
default_frame false); the Shift tests also cover the untouched default
frame (and, for Shift+I, no frame), where the letters must still reach
the tool keys. Plain P with a crop in progress still toggles Classic
Mode, so the setup really reaches the key checks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
David MannandClaude Opus 5.5 committed 2026-11-06 01:33:34 +01:00
1 parent 54507626d1
commit e5e2ef36d0
2 files changed
+62 -25

No files matched your search

+40 -14
View File
@@ -389,25 +389,51 @@ mod tests {
assert!(app.ui.tool_options.crop_shield.show_cropped_area);
}
/// ⇧H and ⇧P are the Hand and Pen tool keys even with a crop box: egui's `consume_key` ignores
/// an extra ⇧, so the plain-key checks must refuse it.
/// A crop in progress: a frame changed from the default one, so [`keys`] gets past its
/// early returns (#9731).
fn crop_in_progress_app() -> PhotocraftApp {
let mut app = crop_app();
app.ui.crop_rect = Some([20.0, 10.0, 120.0, 90.0]);
app.crop.default_frame = false;
app
}
/// ⇧H and ⇧P are the Hand and Pen tool keys with a crop in progress, where plain H and P are
/// the crop box's: egui's `consume_key` ignores an extra ⇧, so the plain-key checks must refuse
/// it. Over the untouched default frame they are the tool keys too.
#[test]
fn shift_h_and_shift_p_switch_tools_instead_of_crop_options() {
for (key, tool) in [(Key::H, Tool::Hand), (Key::P, Tool::Pen)] {
let mut app = crop_app();
assert!(app.session.prefs().tools.use_shift_key_for_tool_switch);
let before = app.ui.tool_options.crop_shield.clone();
let ctx = egui::Context::default();
ctx.input_mut(|i| {
// Only the event holds ⇧, as with a control-channel `ui.key` (the frame's state lags).
i.events.push(egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::SHIFT });
});
crate::shortcuts::handle(&mut app, &ctx);
assert_eq!(app.ui.tool, tool, "{key:?}");
assert_eq!(app.ui.tool_options.crop_shield, before, "{key:?} leaves Show Cropped Area and Classic Mode alone");
for in_progress in [true, false] {
for (key, tool) in [(Key::H, Tool::Hand), (Key::P, Tool::Pen)] {
let mut app = if in_progress { crop_in_progress_app() } else { crop_app() };
assert_eq!(app.crop.default_frame, !in_progress);
assert!(app.session.prefs().tools.use_shift_key_for_tool_switch);
let before = app.ui.tool_options.crop_shield.clone();
let ctx = egui::Context::default();
ctx.input_mut(|i| {
// Only the event holds ⇧, as with a control-channel `ui.key` (the frame's state lags).
i.events.push(egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::SHIFT });
});
crate::shortcuts::handle(&mut app, &ctx);
assert_eq!(app.ui.tool, tool, "{key:?}, crop in progress: {in_progress}");
assert_eq!(app.ui.tool_options.crop_shield, before, "{key:?} leaves Show Cropped Area and Classic Mode alone");
}
}
}
/// The same plain H and P with a crop in progress are still the crop box's keys, so the test
/// above really reaches the key checks.
#[test]
fn plain_p_toggles_classic_mode_while_a_crop_is_in_progress() {
let mut app = crop_in_progress_app();
let classic = app.ui.tool_options.crop_shield.classic_mode;
let ctx = egui::Context::default();
ctx.input_mut(|i| i.events.push(egui::Event::Key { key: Key::P, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }));
crate::shortcuts::handle(&mut app, &ctx);
assert_eq!(app.ui.tool, Tool::Crop, "P doesn't switch to the Pen tool");
assert_eq!(app.ui.tool_options.crop_shield.classic_mode, !classic);
}
/// Alt+H, Alt+P and Alt+I are not the crop box's H, P and I (Show Cropped Area, Classic Mode,
/// Front Image): egui's `consume_key` ignores an extra ⌥, so the plain-key checks must refuse
/// it and leave the press for later handlers.
+22 -11
View File
@@ -537,19 +537,30 @@ mod tests {
assert!(!keys(&mut app2, &ctx));
}
/// ⇧I is the Eyedropper group's key even with the Crop tool, not Front Image.
/// ⇧I is the Eyedropper group's key even with the Crop tool, not Front Image: with no frame
/// yet, over the untouched default frame and with a crop in progress.
#[test]
fn shift_i_with_the_crop_tool_switches_to_the_eyedropper() {
let mut app = app(SampleType::U8);
let ratio = app.ui.tool_options.crop_ratio.clone();
let ctx = egui::Context::default();
ctx.input_mut(|i| {
// Only the event holds ⇧, as with a control-channel `ui.key` (the frame's state lags).
i.events.push(egui::Event::Key { key: egui::Key::I, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::SHIFT });
});
crate::shortcuts::handle(&mut app, &ctx);
assert_eq!(app.ui.tool, Tool::Eyedropper);
assert_eq!(app.ui.tool_options.crop_ratio, ratio);
for frame in ["none", "default", "in progress"] {
let mut app = app(SampleType::U8);
if frame != "none" {
crate::crop_ui::ensure_frame(&mut app);
assert!(app.ui.crop_rect.is_some() && app.crop.default_frame, "{frame}");
}
if frame == "in progress" {
app.ui.crop_rect = Some([20.0, 10.0, 120.0, 90.0]);
app.crop.default_frame = false;
}
let ratio = app.ui.tool_options.crop_ratio.clone();
let ctx = egui::Context::default();
ctx.input_mut(|i| {
// Only the event holds ⇧, as with a control-channel `ui.key` (the frame's state lags).
i.events.push(egui::Event::Key { key: egui::Key::I, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::SHIFT });
});
crate::shortcuts::handle(&mut app, &ctx);
assert_eq!(app.ui.tool, Tool::Eyedropper, "{frame}");
assert_eq!(app.ui.tool_options.crop_ratio, ratio, "{frame}");
}
}
/// Committing a W x H x Resolution crop resamples the frame's area to exactly W x H px and sets