Use toolbar order for fresh tool shortcuts

This commit is contained in:
Codex committed 2026-11-06 21:26:46 -08:00
1 parent f68e227026
commit 2eb4e84411
2 files changed
+93 -3

No files matched your search

+8 -3
View File
@@ -916,15 +916,16 @@ fn select_tool_by_key(app: &mut PhotocraftApp, ctx: &egui::Context, pressed: &im
if cycle_shift || pressed(k) {
let before = app.ui.tool;
let mut group: Vec<Tool> = Tool::ALL.iter().copied().filter(|x| x.key() == t.key() && crate::tool_shortcuts::uses_default(app, *x)).collect();
// Shift+key (the cycle and the fallback to the group's first tool) uses the toolbar
// flyout's order; plain keys keep the `Tool::ALL` order.
// Shift+key cycles in toolbar flyout order.
if cycle_shift {
group.sort_by_key(|x| crate::panels::toolbar::toolbar_position(*x));
}
app.ui.tool = match group.iter().position(|x| *x == app.ui.tool) {
Some(i) if shift_switch && !cycle_shift => group[i],
Some(i) => group[(i + 1) % group.len()],
None => app.ui.group_tool(t.key()).filter(|last| group.contains(last)).unwrap_or(group[0]),
None => app.ui.group_tool(t.key()).filter(|last| group.contains(last)).unwrap_or_else(|| {
group.iter().copied().min_by_key(|tool| crate::panels::toolbar::toolbar_position(*tool)).unwrap_or(t)
}),
};
crate::tool_memory::ended_by_tool(app);
// `consume_key` ignores extra ⇧ and ⌥: a ⇧/⌥ switch is never spring-loaded.
@@ -942,3 +943,7 @@ fn select_tool_by_key(app: &mut PhotocraftApp, ctx: &egui::Context, pressed: &im
#[cfg(test)]
mod tests;
#[cfg(test)]
#[path = "tool_key_default_tests.rs"]
mod tool_key_default_tests;
@@ -0,0 +1,85 @@
use super::{Key, Modifiers, PhotocraftApp, Tool, handle};
use crate::panels::toolbar::TOOL_SECTIONS;
use crate::spring_tools::key_of;
use std::collections::HashSet;
fn app() -> PhotocraftApp {
PhotocraftApp::new(photocraft_engine::Session::new(), Default::default())
}
fn press(app: &mut PhotocraftApp, ctx: &egui::Context, key: Key, modifiers: Modifiers) {
let raw = egui::RawInput {
events: vec![
egui::Event::ModifiersChanged(modifiers),
egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers },
egui::Event::Key { key, physical_key: None, pressed: false, repeat: false, modifiers },
],
..Default::default()
};
ctx.begin_pass(raw);
handle(app, ctx);
ctx.end_pass().textures_delta.clear();
}
#[test]
fn fresh_tool_letters_pick_the_first_tool_in_toolbar_order() {
for shift_switch in [true, false] {
let mut checked = HashSet::new();
for tool in TOOL_SECTIONS.iter().flat_map(|section| section.iter()).flat_map(|slot| slot.iter()).copied() {
let Some(key) = key_of(tool.key()) else { continue };
if !checked.insert(key) {
continue;
}
let mut app = app();
app.session.edit_prefs(|prefs| prefs.tools.use_shift_key_for_tool_switch = shift_switch);
if app.ui.tool.key() == tool.key() {
app.ui.tool = Tool::Brush;
}
press(&mut app, &egui::Context::default(), key, Modifiers::NONE);
assert_eq!(app.ui.tool, tool, "{key:?}, Shift switch: {shift_switch}");
}
assert_eq!(checked, Tool::ALL.into_iter().filter_map(|tool| key_of(tool.key())).collect::<HashSet<_>>());
}
}
#[test]
fn plain_w_returns_to_the_remembered_magic_wand() {
for hidden in [false, true] {
let mut app = app();
let ctx = egui::Context::default();
if hidden {
app.session.edit_prefs(|prefs| prefs.toolbar.hidden = vec!["MagicWand".to_owned()]);
}
app.ui.tool = Tool::MagicWand;
press(&mut app, &ctx, Key::B, Modifiers::NONE);
assert_eq!(app.ui.tool, Tool::Brush);
press(&mut app, &ctx, Key::W, Modifiers::NONE);
assert_eq!(app.ui.tool, Tool::MagicWand, "hidden: {hidden}");
}
}
#[test]
fn shift_w_cycles_in_toolbar_order() {
let mut app = app();
let ctx = egui::Context::default();
app.ui.tool = Tool::ObjectSelection;
for expected in [Tool::QuickSelection, Tool::MagicWand, Tool::ObjectSelection] {
press(&mut app, &ctx, Key::W, Modifiers::SHIFT);
assert_eq!(app.ui.tool, expected);
}
press(&mut app, &ctx, Key::W, Modifiers::NONE);
assert_eq!(app.ui.tool, Tool::ObjectSelection);
}
#[test]
fn remapped_first_tool_is_skipped_by_its_default_letter() {
let mut app = app();
let ctx = egui::Context::default();
app.run("prefs.set", serde_json::json!({"path": "shortcuts.tools.select.objectSelection", "value": "F6"})).unwrap();
press(&mut app, &ctx, Key::W, Modifiers::NONE);
assert_eq!(app.ui.tool, Tool::QuickSelection);
press(&mut app, &ctx, Key::F6, Modifiers::NONE);
assert_eq!(app.ui.tool, Tool::ObjectSelection);
}