From 6b7bbabbf1c8faa3fd19dbed4380f14e84ebb70f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Mon, 16 Nov 2026 21:19:19 -0800 Subject: [PATCH] Command search: a saved palette toggle does not take a Recent Commands place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A Recent Commands list saved before picks of Help › Search Commands… were left out could hold the palette's own toggle. remember counted it toward the eight picks it keeps, so after the next pick the list kept one command fewer. remember now drops the toggle before it counts. --- crates/ui-egui/src/palette.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/palette.rs b/crates/ui-egui/src/palette.rs index f7e105db80..fde40c7765 100644 --- a/crates/ui-egui/src/palette.rs +++ b/crates/ui-egui/src/palette.rs @@ -599,9 +599,10 @@ const MAX_SAVED_RECENT_COMMANDS: usize = 20; /// Puts `id` first in the Recent Commands ids `list`, removing its earlier place, and keeps the /// newest [`MAX_RECENT_COMMANDS`] ids that are `known`. An id that is not `known` now (a plug-in /// that is disabled or not loaded yet) keeps its place among them, so it shows again when its -/// command comes back. The list never holds more than [`MAX_SAVED_RECENT_COMMANDS`] ids. +/// command comes back. The palette's own toggle, saved before its picks were left out, is dropped +/// so that it does not take a place. The list never holds more than [`MAX_SAVED_RECENT_COMMANDS`] ids. fn remember(list: &mut Vec, id: &str, known: impl Fn(&str) -> bool) { - list.retain(|c| c != id); + list.retain(|c| c != id && c != PALETTE_TOGGLE); list.insert(0, id.to_string()); let mut kept = 0; let end = list.iter().position(|c| { @@ -1323,6 +1324,24 @@ mod tests { assert_eq!(list.first().map(String::as_str), Some("paint.swap")); } + /// A palette toggle saved in a full Recent Commands list does not take one of its places: after + /// another pick the list keeps that pick and the seven newest commands before it, and the + /// toggle is dropped. + #[test] + fn a_saved_palette_toggle_does_not_take_a_recent_place() { + let entries = build(Lang::EN); + let known = |c: &str| entries.iter().any(|e| e.id == c); + assert!(known(PALETTE_TOGGLE), "the toggle has a result"); + let others: Vec = + entries.iter().filter(|e| e.id != PALETTE_TOGGLE && e.id != "paint.swap").take(MAX_RECENT_COMMANDS).map(|e| e.id.clone()).collect(); + let mut list: Vec = std::iter::once(PALETTE_TOGGLE.to_string()).chain(others.iter().cloned()).collect(); + remember(&mut list, "paint.swap", known); + let expected: Vec = std::iter::once("paint.swap".to_string()).chain(others.iter().take(MAX_RECENT_COMMANDS - 1).cloned()).collect(); + assert_eq!(list, expected); + let shown: Vec<&str> = recent(&entries, &list).iter().map(|e| e.id.as_str()).collect(); + assert_eq!(shown.len(), MAX_RECENT_COMMANDS); + } + /// The open palette drawn over `app`, after the frame's keys go to the shortcuts as in the app, /// with a query no result matches, so the only command buttons are the Recent Commands list's. fn palette_harness(mut app: VectorcraftApp) -> egui_kittest::Harness<'static, VectorcraftApp> {